Fixed the member count check for LB PoolMember
Also fixes the stack state check when delete fails temporarily Change-Id: I0a9adae954716d2cc47f1eb942401300814c3cbf Closes-bug: #1400533
This commit is contained in:
parent
588983f476
commit
5e65c3e2da
|
@ -234,7 +234,7 @@ class SimpleChainDriver(object):
|
||||||
for key in config_param_names or []:
|
for key in config_param_names or []:
|
||||||
if "PoolMemberIP" in key:
|
if "PoolMemberIP" in key:
|
||||||
value = (member_ips[member_count]
|
value = (member_ips[member_count]
|
||||||
if len(member_ips) >= member_count else '0')
|
if len(member_ips) > member_count else '0')
|
||||||
member_count = member_count + 1
|
member_count = member_count + 1
|
||||||
config_param_values[key] = value
|
config_param_values[key] = value
|
||||||
elif key == "Subnet":
|
elif key == "Subnet":
|
||||||
|
@ -289,7 +289,7 @@ class SimpleChainDriver(object):
|
||||||
stack = heatclient.get(stack_id)
|
stack = heatclient.get(stack_id)
|
||||||
if stack.stack_status == 'DELETE_COMPLETE':
|
if stack.stack_status == 'DELETE_COMPLETE':
|
||||||
return
|
return
|
||||||
elif stack.stack_status == 'ERROR':
|
elif stack.stack_status == 'DELETE_FAILED':
|
||||||
heatclient.delete(stack_id)
|
heatclient.delete(stack_id)
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.exception(_("Service Chain Instance cleanup may not have "
|
LOG.exception(_("Service Chain Instance cleanup may not have "
|
||||||
|
|
Loading…
Reference in New Issue