summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--heat/engine/service.py8
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,