From d18262b41e7377f3d2bd6fa37a9b6e267f728471 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 14 May 2018 15:27:48 -0600 Subject: [PATCH] Drop default inclusion of undercloud.yaml Previously we were always included THT/environments/undercloud.yaml for all invocations of the standalone deployment. We are handling that in the undercloud_config as part of the undercloud installation so the standalone deploy should not include it so we can include alternate deployment environments. Change-Id: Ib810dfb943d4d09f60377eae0bac6dd6dd2eaf20 Related-Blueprint: all-in-one --- tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py | 2 -- tripleoclient/v1/tripleo_deploy.py | 4 ---- 2 files changed, 6 deletions(-) diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py index 4a925c345..55297a782 100644 --- a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py +++ b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py @@ -289,8 +289,6 @@ class TestDeployUndercloud(TestPluginV1): 'overcloud-resource-registry-puppet.yaml', mock.ANY, '/my/tripleo-heat-installer-templates/' - 'environments/undercloud.yaml', - '/my/tripleo-heat-installer-templates/' 'environments/config-download-environment.yaml', '/my/tripleo-heat-installer-templates/' 'environments/deployed-server-noop-ctlplane.yaml', diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 6d53bad90..28e2476a6 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -377,10 +377,6 @@ class Deploy(command.Command): pw_file = self._update_passwords_env(self.output_dir) environments.insert(1, pw_file) - undercloud_env_path = os.path.join( - self.tht_render, 'environments', 'undercloud.yaml') - environments.append(undercloud_env_path) - # use deployed-server because we run os-collect-config locally deployed_server_env = os.path.join( self.tht_render, 'environments',