openstack
/
heat
Code Issues Proposed changes

Merge "Allow update of previously-replaced resources" into stable/queens

This commit is contained in:
Zuul 2019-08-05 20:49:52 +00:00 committed by Gerrit Code Review
parent fedcbb84bf 7a7d9d70ba
commit 04173f5838
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/check_resource.py
View File

@ -321,14 +321,6 @@ class CheckResource(object):
stack.adopt_stack_data = adopt_stack_data
stack.thread_group_mgr = self.thread_group_mgr
if is_update:
if (rsrc.replaced_by is not None and
rsrc.current_template_id != tmpl.id):
LOG.debug('Resource %s with id %s already replaced by %s; '
'not checking',
rsrc.name, resource_id, rsrc.replaced_by)
return
try:
check_resource_done = self._do_check_resource(cnxt,
current_traversal,

2
heat/engine/resource.py
View File

@ -1465,7 +1465,7 @@ class Resource(status.ResourceStatus):
self.state_set(self.UPDATE, self.FAILED,
six.text_type(failure))
raise failure
self.replaced_by = None
self.replaced_by = None
runner = scheduler.TaskRunner(
self.update, new_res_def,