openstack
/
python-tripleoclient
Code Issues Proposed changes

undercloud: don't include config-download env 

Since I8389a0c48e1aa610fdc6a8580516889340883034 it's the default so we
don't need to include this environment. Also, this env is deprecated in
Rocky so we don't want it anymore.

Change-Id: I36cc547b41b5b407e8ebfedd7167962f15847284
This commit is contained in:
Emilien Macchi 2018-05-02 06:38:14 -07:00
parent c09f50f1ad
commit eca2e3ee31
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -104,8 +104,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'config-download-environment.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/foo',
'-e', '/foo/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@ -161,8 +159,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'config-download-environment.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'-e', '/home/stack/undercloud_parameters.yaml',
'--debug', '--log-file=/tmp/install-undercloud.log'])
@ -220,8 +216,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'config-download-environment.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'-e', '/home/stack/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@ -311,8 +305,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'config-download-environment.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'-e', '/home/stack/undercloud_parameters.yaml',
'--log-file=/tmp/install-undercloud.log'])
@ -371,8 +363,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'config-download-environment.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'undercloud.yaml', '--output-dir=/home/stack',
'-e', '/home/stack/undercloud_parameters.yaml',
'--debug', '--log-file=/tmp/install-undercloud.log'])

3
tripleoclient/v1/undercloud_config.py
View File

@ -791,9 +791,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
deploy_args += [
"-e", os.path.join(tht_templates, "environments/docker.yaml"),
"-e",
os.path.join(tht_templates,
"environments/config-download-environment.yaml"),
"-e", os.path.join(tht_templates, "environments/undercloud.yaml")]
params_file = os.path.abspath(os.path.join(CONF['output_dir'],