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

Signed-off-by: Florian Ludwig <[email protected]>
machine-drivers · Sep 20, 2018 · b36cb27 · b36cb27
1 parent 7909ee3
commit b36cb27
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/drivers/openstack/openstack.go b/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