Merge "Allow update of previously-replaced resources"
This commit is contained in:
commit
1eca082f43
|
@ -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,
|
||||
|
|
|
@ -1449,7 +1449,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,
|
||||
|
|
Loading…
Reference in New Issue