diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-01 17:00:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-01 17:00:26 +0000 |
| commit | 3f81939870c3b3de63a4cb98c77ded728e6d1948 (patch) | |
| tree | b10760f59468aa301d02b968ab4243a483807b69 | |
| parent | 74d3a36150c6c9642175bedb30803601094f5cb1 (diff) | |
| parent | c86cfa6e8358046ce2b9064a3d2b2cb634a0ae4f (diff) | |
| download | heat-3f81939870c3b3de63a4cb98c77ded728e6d1948.tar.gz | |
Merge "Allow update of previously-replaced resources" into stable/rocky
| -rw-r--r-- | heat/engine/check_resource.py | 8 | ||||
| -rw-r--r-- | heat/engine/resource.py | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/heat/engine/check_resource.py b/heat/engine/check_resource.py index 366567634..a2f6d842c 100644 --- a/heat/engine/check_resource.py +++ b/heat/engine/check_resource.py @@ -304,14 +304,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, diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 215b89a41..677ded23e 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1456,7 +1456,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, new_template_id=template_id, |