diff options
author | Zuul <zuul@review.opendev.org> | 2020-07-17 21:01:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-07-17 21:01:56 +0000 |
commit | 4c22106f333cc1b1bbfb23afd27395edb5de53f9 (patch) | |
tree | e3ed048c6d997134325b462ed52d3edfe7843bf7 | |
parent | e89351aba96edffc99fc51a5d133d5b59736c515 (diff) | |
parent | ba6218cd333208aacb686d0f94507cdd0004b4d1 (diff) | |
download | heat-4c22106f333cc1b1bbfb23afd27395edb5de53f9.tar.gz |
Merge "Don't check stack staus for already migrated stacks" into stable/train
-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, |