openstack
/
heat
Code Issues Proposed changes

Merge "Allow update of previously-replaced resources"

This commit is contained in:
Zuul 2019-03-12 13:14:55 +00:00 committed by Gerrit Code Review
parent 16e35cfbb0 e34da89290
commit 1eca082f43
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

@ -304,14 +304,6 @@ class CheckResource(object):
stack.adopt_stack_data = adopt_stack_data stack.adopt_stack_data = adopt_stack_data
stack.thread_group_mgr = self.thread_group_mgr 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: try:
check_resource_done = self._do_check_resource(cnxt, check_resource_done = self._do_check_resource(cnxt,
current_traversal, current_traversal,