openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Move custom env file to last"

Browse Source
This commit is contained in:
Zuul 2018-06-30 09:13:39 +00:00 committed by Gerrit Code Review
commit 3c271fc278
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/v1/undercloud_config.py
View File

@ -466,10 +466,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
if CONF.get('cleanup'):
deploy_args.append('--cleanup')
if CONF.get('custom_env_files'):
for custom_file in CONF['custom_env_files']:
deploy_args += ['-e', custom_file]
if CONF.get('net_config_override', None):
data_file = CONF['net_config_override']
if os.path.abspath(data_file) != data_file:
@ -543,6 +539,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
deploy_args += ['-e', os.path.join(
tht_templates, "environments/tripleo-validations.yaml")]
if CONF.get('custom_env_files'):
for custom_file in CONF['custom_env_files']:
deploy_args += ['-e', custom_file]
if verbose_level > 1:
deploy_args.append('--debug')