openstack/heat
Code Issues Proposed changes

Merge "Reset stack status after resources"

Browse Source
This commit is contained in:
Jenkins 2016-03-24 15:58:09 +00:00 committed by Gerrit Code Review
commit 2b815e51cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/service.py
View File

@ -2107,8 +2107,6 @@ class EngineService(service.Service):
service_objects.Service.delete(cnxt, service_ref['id'])
def set_stack_and_resource_to_failed(self, stack):
reason = ('Engine went down during stack %s' % stack.action)
stack.state_set(stack.action, stack.FAILED, six.text_type(reason))
for name, rsrc in six.iteritems(stack.resources):
if rsrc.status == rsrc.IN_PROGRESS:
status_reason = ('Engine went down '
@ -2116,6 +2114,8 @@ class EngineService(service.Service):
rsrc.state_set(rsrc.action,
rsrc.FAILED,
six.text_type(status_reason))
reason = ('Engine went down during stack %s' % stack.action)
stack.state_set(stack.action, stack.FAILED, six.text_type(reason))
def reset_stack_status(self):
cnxt = context.get_admin_context()