Merge pull request #1585 from grycap/devel

Fix deleting floating IPs
grycap · Jul 2, 2024 · d6e586e · d6e586e
2 parents 3b45672 + 2995631
commit d6e586e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/IM/connectors/OpenStack.py b/IM/connectors/OpenStack.py
@@ -1609,8 +1609,9 @@ def add_elastic_ip_from_pool(self, vm, node, fixed_ip=None, pool_name=None):
 
                 if not attached:
                     self.log_error("Error attaching a Floating IP to the node.")
-                    self.log_info("We have created it, so release it.")
-                    floating_ip.delete()
+                    if not found:
+                        self.log_info("We have created it, so release it.")
+                        floating_ip.delete()
                     return False, "Error attaching a Floating IP to the node."
 
                 if found:
@@ -1746,7 +1747,6 @@ def finalize(self, vm, last, auth_data):
             try:
                 res, msg = self.delete_elastic_ips(node, vm)
             except Exception as ex:
-                res = False
                 msg = get_ex_error(ex)
             success.append(res)
             msgs.append(msg)