diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index 7e41f6638..6a50fe043 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -81,8 +81,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch("heatclient.common.event_utils.get_events") @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_create_parameters_env', autospec=True) @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -107,7 +105,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_create_tempest_deployer_input, mock_deploy_postconfig, mock_create_parameters_env, - mock_config_download_env, mock_breakpoints_cleanupm, mock_events, mock_tarball, mock_get_horizon_url, @@ -200,8 +197,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_validate_args') @mock.patch('tripleoclient.utils.create_tempest_deployer_input', @@ -227,7 +222,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_write_overcloudrc, mock_create_tempest_deployer_input, mock_validate_args, - mock_config_download_env, mock_breakpoints_cleanup, mock_tarball, mock_postconfig, mock_get_overcloud_endpoint, mock_invoke_plan_env_wf, @@ -346,8 +340,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_validate_args') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -372,7 +364,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_get_template_contents, wait_for_stack_ready_mock, mock_remove_known_hosts, mock_overcloudrc, mock_write_overcloudrc, mock_create_tempest_deployer, mock_create_parameters_env, - mock_validate_args, mock_inject_config_download_env, + mock_validate_args, mock_breakpoints_cleanup, mock_tarball, mock_postconfig, mock_get_overcloud_endpoint, mock_shutil_rmtree, @@ -462,7 +454,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_create_tempest_deployer.assert_called_with() mock_validate_args.assert_called_once_with(parsed_args) - mock_inject_config_download_env.assert_called() mock_tarball.create_tarball.assert_called_with( '/tmp/tht/tripleo-heat-templates', mock.ANY) @@ -492,8 +483,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_validate_args') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -522,7 +511,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_write_overcloudrc, mock_create_tempest_deployer_input, mock_create_parameters_env, mock_validate_args, - mock_config_download_env, mock_breakpoints_cleanup, mock_tarball, mock_postconfig, mock_get_overcloud_endpoint, mock_deprecated_params, mock_get_horizon_url, @@ -597,8 +585,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch("heatclient.common.event_utils.get_events", autospec=True) @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_postconfig', autospec=True) @mock.patch('tripleoclient.utils.create_tempest_deployer_input', @@ -618,7 +604,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_write_overcloudrc, mock_create_tempest_deployer_input, mock_deploy_postconfig, - mock_config_download_env, mock_breakpoints_cleanup, mock_events, mock_tarball, mock_get_horizon_url, @@ -720,8 +705,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True) @mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_postconfig', autospec=True) @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -731,7 +714,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('shutil.copytree', autospec=True) def test_environment_dirs(self, mock_copy, mock_deploy_heat, mock_update_parameters, mock_post_config, - mock_config_download_env, mock_utils_endpoint, mock_utils_createrc, mock_utils_tempest, mock_tarball, mock_get_horizon_url, mock_list_plans, @@ -794,8 +776,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True) @mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True) @mock.patch('tripleoclient.utils.get_stack', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_postconfig', autospec=True) @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -805,7 +785,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('shutil.copytree', autospec=True) def test_environment_dirs_env(self, mock_copy, mock_deploy_heat, mock_update_parameters, mock_post_config, - mock_config_download_env, mock_utils_get_stack, mock_utils_endpoint, mock_utils_createrc, mock_utils_tempest, mock_tarball, mock_list_plans): @@ -859,8 +838,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True) @mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_postconfig', autospec=True) @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -872,7 +849,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_deploy_heat, mock_update_parameters, mock_post_config, - mock_config_download_env, mock_utils_endpoint, mock_utils_createrc, mock_utils_tempest, @@ -1014,8 +990,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch("heatclient.common.event_utils.get_events", autospec=True) @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_postconfig', autospec=True) @mock.patch('tripleoclient.utils.create_tempest_deployer_input', @@ -1041,7 +1015,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_write_overcloudrc, mock_create_tempest_deployer_input, mock_deploy_postconfig, - mock_config_download_env, mock_breakpoints_cleanup, mock_events, mock_tarball, mock_get_horizon_url, @@ -1269,8 +1242,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): autospec=True) @mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True) @mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True) - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_heat_deploy', autospec=True) @mock.patch('shutil.copytree', autospec=True) @@ -1280,7 +1251,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): def test_answers_file(self, mock_sleep, mock_rmtree, mock_tmpdir, mock_copy, mock_heat_deploy, - mock_config_download_env, mock_oc_endpoint, mock_create_ocrc, mock_create_tempest_deployer_input, @@ -1463,8 +1433,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_validate_args') - @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' - '_inject_config_download_env') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_create_parameters_env', autospec=True) @mock.patch('tripleoclient.utils.create_tempest_deployer_input', @@ -1490,7 +1458,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_write_overcloudrc, mock_create_tempest_deployer_input, mock_create_parameters_env, - mock_config_download_env, mock_validate_args, mock_breakpoints_cleanup, mock_tarball, diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 1f7a67f58..642e8d8c4 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -417,13 +417,6 @@ class DeployOvercloud(command.Command): if parsed_args.environment_files: created_env_files.extend(parsed_args.environment_files) - # TODO(slagle): config-download-environment.yaml must be forcibly - # injected since --config-download now defaults to True. Once - # https://review.openstack.org/#/c/558927/ has landed, this can be - # removed. - if parsed_args.config_download: - self._inject_config_download_env(user_tht_root, created_env_files) - self.log.debug("Processing environment files %s" % created_env_files) env_files, localenv = utils.process_multiple_environments( created_env_files, tht_root, user_tht_root, @@ -451,12 +444,6 @@ class DeployOvercloud(command.Command): parsed_args.run_validations, parsed_args.skip_deploy_identifier, parsed_args.plan_environment_file) - def _inject_config_download_env(self, tht_root, env_files): - env_files.insert( - 0, os.path.join( - tht_root, - 'environments/config-download-environment.yaml')) - def _try_overcloud_deploy_with_compat_yaml(self, tht_root, stack, stack_name, parameters, env_files, timeout,