diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-05 20:49:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-05 20:49:52 +0000 |
| commit | 04173f583830d670db31608e67b02c506e0bf85a (patch) | |
| tree | 21ab3cd69a65eda8d5fa1d46742862292d73aa07 | |
| parent | fedcbb84bf53d7aca8ed2e638751c684795aaaae (diff) | |
| parent | 7a7d9d70bacbce33964b38c2abfa143d65511333 (diff) | |
| download | heat-04173f583830d670db31608e67b02c506e0bf85a.tar.gz | |
Merge "Allow update of previously-replaced resources" into stable/queens
| -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 d04a6f5db..2424cf934 100644 --- a/heat/engine/check_resource.py +++ b/heat/engine/check_resource.py @@ -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, diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 8b6cf57d8..2e5906684 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -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, |