Merge "Don't resolve Heat stack output when unnecessary"
This commit is contained in:
commit
d531c93cb6
|
@ -143,7 +143,7 @@ class DeployStackAction(templates.ProcessTemplatesAction):
|
|||
# check to see if the stack exists
|
||||
heat = self.get_orchestration_client(context)
|
||||
try:
|
||||
stack = heat.stacks.get(self.container)
|
||||
stack = heat.stacks.get(self.container, resolve_outputs=False)
|
||||
except heat_exc.HTTPNotFound:
|
||||
stack = None
|
||||
|
||||
|
|
|
@ -110,8 +110,7 @@ class DeletePlanAction(base.TripleOAction):
|
|||
# heat throws HTTPNotFound if the stack is not found
|
||||
try:
|
||||
stack = self.get_orchestration_client(context).stacks.get(
|
||||
self.container
|
||||
)
|
||||
self.container, resolve_outputs=False)
|
||||
except heatexceptions.HTTPNotFound:
|
||||
pass
|
||||
else:
|
||||
|
|
|
@ -262,7 +262,8 @@ class DeletePlanActionTest(base.TestCase):
|
|||
# test that stack exists
|
||||
action = plan.DeletePlanAction(self.container_name)
|
||||
self.assertRaises(exception.StackInUseError, action.run, self.ctx)
|
||||
heat.stacks.get.assert_called_with(self.container_name)
|
||||
heat.stacks.get.assert_called_with(
|
||||
self.container_name, resolve_outputs=False)
|
||||
|
||||
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
|
||||
@mock.patch(
|
||||
|
|
Loading…
Reference in New Issue