openstack
/
python-tripleoclient
Code Issues Proposed changes

We don't have to disable validations anymore for pre-deployed OC 

The need of disabling validations when deploying an OC over pre-deployed
nodes is no longer a thing. Let's drop this requirement from now on and
get a validated deploy!

Change-Id: Ic8f1b9aa61327c246ac062243b7b17844998698a
This commit is contained in:
Cédric Jeanneret 2021-01-22 11:22:56 +01:00
parent efef71ac22
commit 7c066dec13
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -1356,22 +1356,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
self.assertTrue(utils_fixture.mock_deploy_tht.called)
mock_copy.assert_called_once()
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_tripleo_heat_templates', autospec=True)
def test_fail_overcloud_deploy_with_deployed_server_and_validations(
self, mock_deploy_tmpdir):
arglist = ['--templates', '--deployed-server']
verifylist = [
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
('deployed_server', True),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(oscexc.CommandError,
self.cmd.take_action,
parsed_args)
self.assertFalse(mock_deploy_tmpdir.called)
@mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
'_get_undercloud_host_entry', autospec=True,

6
tripleoclient/v1/overcloud_deploy.py
View File

@ -671,12 +671,6 @@ class DeployOvercloud(command.Command):
"Error: --deployed-server must be used when using "
"--baremetal-deployment")
if parsed_args.deployed_server and (parsed_args.run_validations
or not parsed_args.disable_validations):
raise oscexc.CommandError(
"Error: The --deployed-server cannot be used without "
"the --disable-validations")
if parsed_args.environment_directories:
self._validate_args_environment_directory(
parsed_args.environment_directories)