openstack
/
python-tripleoclient
Code Issues Proposed changes

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
This commit is contained in:
Alex Schultz 2018-05-14 15:27:48 -06:00
parent f1721e24ec
commit d18262b41e
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
View File

@ -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',

4
tripleoclient/v1/tripleo_deploy.py
View File

@ -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',