Merge "Don't check stack staus for already migrated stacks" into stable/train
This commit is contained in:
commit
4c22106f33
|
@ -2293,15 +2293,15 @@ class EngineService(service.ServiceBase):
|
||||||
msg = _("Migration of nested stack %s") % stack_id
|
msg = _("Migration of nested stack %s") % stack_id
|
||||||
raise exception.NotSupported(feature=msg)
|
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:
|
if parent_stack.convergence:
|
||||||
LOG.info("Convergence was already enabled for stack %s",
|
LOG.info("Convergence was already enabled for stack %s",
|
||||||
stack_id)
|
stack_id)
|
||||||
return
|
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(
|
db_stacks = stack_object.Stack.get_all_by_root_owner_id(
|
||||||
ctxt, parent_stack.id)
|
ctxt, parent_stack.id)
|
||||||
stacks = [parser.Stack.load(ctxt, stack_id=st.id,
|
stacks = [parser.Stack.load(ctxt, stack_id=st.id,
|
||||||
|
|
Loading…
Reference in New Issue