fix elastx cleanup security groups (kubernetes-sigs#11411)

JosBritton · Sep 15, 2024 · e5d2452 · e5d2452
1 parent 8cb081a
commit e5d2452
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/scripts/openstack-cleanup/main.py b/scripts/openstack-cleanup/main.py
@@ -37,17 +37,6 @@ def main():
     map_if_old(conn.compute.delete_server,
                conn.compute.servers())
 
-    print('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:
         map_if_old(conn.network.delete_port,
@@ -73,6 +62,17 @@ def main():
         map_if_old(conn.network.delete_port,
                    conn.network.ports())
 
+    print('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('Subnets...')
     map_if_old(conn.network.delete_subnet,
                conn.network.subnets())