fix elastx cleanup security groups (#11536)
Co-authored-by: Kay Yan <kay.yan@daocloud.io>pull/11615/head
parent
d80686acb0
commit
4577ee4a5d
|
@ -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…
Reference in New Issue