From e5d2452828f794ad0ae3c182b4477bf7d33a8402 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Sun, 15 Sep 2024 20:59:13 +0800
Subject: [PATCH] fix elastx cleanup security groups (#11411)
---
scripts/openstack-cleanup/main.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/openstack-cleanup/main.py b/scripts/openstack-cleanup/main.py
index 28820de02..d10e4725b 100755
--- 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())
--
GitLab