Browse Source

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

changes/96/677396/1
Zuul 2 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):
321 321
         stack.adopt_stack_data = adopt_stack_data
322 322
         stack.thread_group_mgr = self.thread_group_mgr
323 323
 
324
-        if is_update:
325
-            if (rsrc.replaced_by is not None and
326
-                    rsrc.current_template_id != tmpl.id):
327
-                LOG.debug('Resource %s with id %s already replaced by %s; '
328
-                          'not checking',
329
-                          rsrc.name, resource_id, rsrc.replaced_by)
330
-                return
331
-
332 324
         try:
333 325
             check_resource_done = self._do_check_resource(cnxt,
334 326
                                                           current_traversal,

+ 1
- 1
heat/engine/resource.py View File

@@ -1465,7 +1465,7 @@ class Resource(status.ResourceStatus):
1465 1465
                 self.state_set(self.UPDATE, self.FAILED,
1466 1466
                                six.text_type(failure))
1467 1467
                 raise failure
1468
-            self.replaced_by = None
1468
+        self.replaced_by = None
1469 1469
 
1470 1470
         runner = scheduler.TaskRunner(
1471 1471
             self.update, new_res_def,

Loading…
Cancel
Save