mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2025-12-13 21:34:40 +03:00
fix elastx cleanup security groups (#11411)
This commit is contained in:
@@ -37,17 +37,6 @@ def main():
|
|||||||
map_if_old(conn.compute.delete_server,
|
map_if_old(conn.compute.delete_server,
|
||||||
conn.compute.servers())
|
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...')
|
print('Ports...')
|
||||||
try:
|
try:
|
||||||
map_if_old(conn.network.delete_port,
|
map_if_old(conn.network.delete_port,
|
||||||
@@ -73,6 +62,17 @@ def main():
|
|||||||
map_if_old(conn.network.delete_port,
|
map_if_old(conn.network.delete_port,
|
||||||
conn.network.ports())
|
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...')
|
print('Subnets...')
|
||||||
map_if_old(conn.network.delete_subnet,
|
map_if_old(conn.network.delete_subnet,
|
||||||
conn.network.subnets())
|
conn.network.subnets())
|
||||||
|
|||||||
Reference in New Issue
Block a user