Merge "[k8s] Fix PreDeletionFailed if Heat stack is missing" into stable/ussuri
This commit is contained in:
commit
ee6b621ca4
|
@ -99,6 +99,11 @@ def delete_loadbalancers(context, cluster):
|
||||||
octavia_client_adm, remove_fip=True)
|
octavia_client_adm, remove_fip=True)
|
||||||
candidates.update(deleted)
|
candidates.update(deleted)
|
||||||
|
|
||||||
|
# NOTE (brtknr): If stack has been deleted, cluster fails to delete
|
||||||
|
# because stack_id resolves to None. Return if that is the case.
|
||||||
|
if not cluster.stack_id:
|
||||||
|
return
|
||||||
|
|
||||||
# Get load balancers created for Kubernetes api/etcd
|
# Get load balancers created for Kubernetes api/etcd
|
||||||
lbs = []
|
lbs = []
|
||||||
lb_resources = heat_client.resources.list(
|
lb_resources = heat_client.resources.list(
|
||||||
|
|
Loading…
Reference in New Issue