Browse Source

fix elastx cleanup security groups (#11536)

Co-authored-by: Kay Yan <kay.yan@daocloud.io>
pull/11615/head
k8s-infra-cherrypick-robot 2 months ago
committed by GitHub
parent
commit
4577ee4a5d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
  1. 22
      scripts/openstack-cleanup/main.py

22
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())

Loading…
Cancel
Save