openstack
/
magnum
Code Issues Proposed changes

Merge "Resolve stack outputs only on COMPLETE"

This commit is contained in:
Zuul 2018-07-23 07:21:33 +00:00 committed by Gerrit Code Review
parent dca86ef7a7 797f0157d6
commit 35bc42714f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magnum/drivers/heat/driver.py
View File

@ -192,8 +192,10 @@ class HeatPoller(object):
# TODO(yuanying): temporary implementation to update api_address,
# node_addresses and cluster status
try:
# Do not resolve outputs by default. Resolving all
# node IPs is expensive on heat.
stack = self.openstack_client.heat().stacks.get(
self.cluster.stack_id)
self.cluster.stack_id, resolve_outputs=False)
except heatexc.NotFound:
self._sync_missing_heat_stack()
return
@ -205,6 +207,10 @@ class HeatPoller(object):
if stack.stack_status in (fields.ClusterStatus.CREATE_COMPLETE,
fields.ClusterStatus.UPDATE_COMPLETE):
# Resolve all outputs if the stack is COMPLETE
stack = self.openstack_client.heat().stacks.get(
self.cluster.stack_id, resolve_outputs=True)
self._sync_cluster_and_template_status(stack)
elif stack.stack_status != self.cluster.status:
self._sync_cluster_status(stack)