diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2020-07-02 10:37:16 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2020-07-14 09:30:11 +0000 |
| commit | ba6218cd333208aacb686d0f94507cdd0004b4d1 (patch) | |
| tree | 3cfb37de44c84d946f28c112037dd2ddfcd1adc0 | |
| parent | e4c9400896a247e9623d368c77f31274448613e2 (diff) | |
| download | heat-ba6218cd333208aacb686d0f94507cdd0004b4d1.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)
(cherry picked from commit 1f66e61ca5db0f324688665f6c769ac24d560c32)
| -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 d761577b5..bb7af5fd3 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -2293,15 +2293,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, |