From 7c066dec13aa09c414f911aa257ab09e5b2b96a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Fri, 22 Jan 2021 11:22:56 +0100 Subject: [PATCH] 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 --- .../v1/overcloud_deploy/test_overcloud_deploy.py | 16 ---------------- tripleoclient/v1/overcloud_deploy.py | 6 ------ 2 files changed, 22 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index 3b4cc406e..08fd32dfe 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -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, diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index c6c6bb66f..7dcdf272e 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -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)