Browse Source

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

changes/96/677396/1
Zuul Gerrit Code Review 10 months ago
parent
commit
04173f5838
2 changed files with 1 additions and 9 deletions
  1. +0
    -8
      heat/engine/check_resource.py
  2. +1
    -1
      heat/engine/resource.py

+ 0
- 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,


+ 1
- 1
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,


Loading…
Cancel
Save