kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix openstack cleanup (#11299) 

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
pull/11318/head
Kay Yan 2024-06-22 01:30:55 +08:00 committed by GitHub
parent 921b0c0bed
commit 647092b483
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -71,7 +71,7 @@ ci-not-authorized:
after_script: [] after_script: []
rules: rules:
# LGTM or ok-to-test labels # LGTM or ok-to-test labels
- if: $PR_LABELS =~ /.*,(lgtm|ok-to-test).*|^(lgtm|ok-to-test).*/i - if: $PR_LABELS =~ /.*,(lgtm|approved|ok-to-test).*|^(lgtm|approved|ok-to-test).*/i
variables: variables:
CI_OK_TO_TEST: '0' CI_OK_TO_TEST: '0'
when: always when: always

11
scripts/openstack-cleanup/main.py
View File

@ -38,8 +38,15 @@ def main():
conn.compute.servers()) conn.compute.servers())
print('Security groups...') print('Security groups...')
map_if_old(conn.network.delete_security_group, try:
conn.network.security_groups()) 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: