openstack: don't fail when trying to delete non-existing keypair

Signed-off-by: Florian Ludwig <[email protected]>

Author: FlorianLudwig

drivers/openstack/openstack.go

@@ -473,7 +473,15 @@ func (d *Driver) Remove() error {
 	if !d.ExistingKey {
 		log.Debug("deleting key pair...", map[string]string{"Name": d.KeyPairName})
 		if err := d.client.DeleteKeyPair(d, d.KeyPairName); err != nil {
-			return err
+			if gopherErr, ok := err.(*gophercloud.UnexpectedResponseCodeError); ok {
+				if gopherErr.Actual == http.StatusNotFound {
+					log.Warn("Keypair already deleted")
+				} else {
+					return err
+				}
+			} else {
+				return err
+			}
 		}
 	}
 	return nil