fix openstack cleanup

Signed-off-by: Kay Yan <[email protected]>
kubernetes-sigs · Jun 18, 2024 · 4cee9b0 · 4cee9b0
1 parent 3e72be2
commit 4cee9b0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/scripts/openstack-cleanup/main.py b/scripts/openstack-cleanup/main.py
@@ -38,8 +38,15 @@ def main():
                conn.compute.servers())
 
     print('Security groups...')
-    map_if_old(conn.network.delete_security_group,
-               conn.network.security_groups())
+    try:
+        map_if_old(conn.network.delete_security_group,
+                conn.network.security_groups())
+    except openstack.exceptions.ConflictException as ex:
+        # Need to delete port when security groups is in used
+        map_if_old(conn.network.delete_port,
+                   conn.network.ports())
+        map_if_old(conn.network.delete_security_group,
+                conn.network.security_groups())
 
     print('Ports...')
     try: