diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2020-07-02 10:37:16 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2020-07-03 08:32:53 +0000 |
| commit | 1f66e61ca5db0f324688665f6c769ac24d560c32 (patch) | |
| tree | 066fe394db23cfe3aa59345dda605e907dd626db | |
| parent | 1e4488b70e114a52744e007d77de7f6cf911658e (diff) | |
| download | heat-1f66e61ca5db0f324688665f6c769ac24d560c32.tar.gz | |
Don't check stack staus for already migrated stacks
If stacks are already migrated to convergence, there is no point
in checking stack status before returning. This will allow re-run
of the command inspite of migrated stacks in FAILED state.
Change-Id: Ia0e34423377843adee8efc7f23d2c2df5dac8e20
Task: 40266
(cherry picked from commit 8d5d2a8fb6145caa7aac1eb90a4787706c298e47)
| -rw-r--r-- | heat/engine/service.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index cc363d6d3..bd3631df7 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -2296,15 +2296,15 @@ class EngineService(service.ServiceBase): msg = _("Migration of nested stack %s") % stack_id raise exception.NotSupported(feature=msg) - if parent_stack.status != parent_stack.COMPLETE: - raise exception.ActionNotComplete(stack_name=parent_stack.name, - action=parent_stack.action) - if parent_stack.convergence: LOG.info("Convergence was already enabled for stack %s", stack_id) return + if parent_stack.status != parent_stack.COMPLETE: + raise exception.ActionNotComplete(stack_name=parent_stack.name, + action=parent_stack.action) + db_stacks = stack_object.Stack.get_all_by_root_owner_id( ctxt, parent_stack.id) stacks = [parser.Stack.load(ctxt, stack_id=st.id, |