Merge "undercloud: enable undercloud_config parameter for validations"

This commit is contained in:
Zuul 2018-12-10 17:39:31 +00:00 committed by Gerrit Code Review
commit 491fd80ac4
1 changed files with 4 additions and 2 deletions

View File

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