From c1ad985618073a1be9978187a0f1d5e3aa26999f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Dec 2018 10:44:02 -0500 Subject: [PATCH] undercloud: enable undercloud_config parameter for validations If TripleO Validations are enabled, we want to export UndercloudConfigFilePath so the validations can work from the Mistral Executor container. UndercloudConfigFilePath is set even if the preflight validations runs are ommitted (when using the --no-validations option). These parameters will be used in THT to feed hieradata and also bind mount the undercloud configuration file. Change-Id: I38f6d562ab452f765672e7cc4e71206b562c471b Related-Bug: #1805825 --- tripleoclient/v1/undercloud_config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index eb6c1771d..31c953763 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -308,8 +308,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False, if CONF.get('undercloud_ntp_servers', None): env_data['NtpServer'] = CONF['undercloud_ntp_servers'][0] - if CONF.get('enable_validations', False) and not no_validations: - env_data['EnableValidations'] = CONF['enable_validations'] + if CONF.get('enable_validations', False): + env_data['UndercloudConfigFilePath'] = constants.UNDERCLOUD_CONF_PATH + if not no_validations: + env_data['EnableValidations'] = CONF['enable_validations'] if CONF.get('overcloud_domain_name', None): env_data['NeutronDnsDomain'] = CONF['overcloud_domain_name']