Remove check for IN_PROGRESS stack
There is no need to disallow concurrent stack updates with convergence heat engine, which we have moved to since stable/queens. Change-Id: I1d3357a0c1401b4d1c4fca3e6925895967c8e97c
This commit is contained in:
parent
2f16fd696d
commit
97012083e8
|
@ -53,10 +53,6 @@ class PlanEnvWorkflowError(Base):
|
|||
"""Plan Environment workflow has failed"""
|
||||
|
||||
|
||||
class StackInProgress(Base):
|
||||
"""Unable to deploy as the stack is busy"""
|
||||
|
||||
|
||||
class RootUserExecution(Base):
|
||||
"""Command was executed by a root user"""
|
||||
|
||||
|
|
|
@ -1234,22 +1234,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
|||
|
||||
self.assertFalse(mock_deploy_and_wait.called)
|
||||
|
||||
def test_heat_stack_busy(self):
|
||||
|
||||
clients = self.app.client_manager
|
||||
orchestration_client = clients.orchestration
|
||||
mock_stack = fakes.create_tht_stack(stack_status="IN_PROGRESS")
|
||||
orchestration_client.stacks.get.return_value = mock_stack
|
||||
|
||||
arglist = ['--templates', ]
|
||||
verifylist = [
|
||||
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(exceptions.StackInProgress,
|
||||
self.cmd.take_action, parsed_args)
|
||||
|
||||
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
|
||||
'_get_undercloud_host_entry', autospec=True,
|
||||
return_value='192.168.0.1 uc.ctlplane.localhost uc.ctlplane')
|
||||
|
|
|
@ -917,11 +917,6 @@ class DeployOvercloud(command.Command):
|
|||
|
||||
stack = utils.get_stack(self.orchestration_client, parsed_args.stack)
|
||||
|
||||
if stack and stack.stack_status == 'IN_PROGRESS':
|
||||
raise exceptions.StackInProgress(
|
||||
"Unable to deploy as the stack '{}' status is '{}'".format(
|
||||
stack.stack_name, stack.stack_status))
|
||||
|
||||
self._update_parameters(parsed_args, stack)
|
||||
|
||||
stack_create = stack is None
|
||||
|
|
Loading…
Reference in New Issue