Merge "Detect TLS for pre-provisioned nodes"

This commit is contained in:
Zuul 2020-06-11 07:36:29 +00:00 committed by Gerrit Code Review
commit 5c7b4664a8
1 changed files with 4 additions and 0 deletions

View File

@ -628,6 +628,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/novajoin.yaml")]
env_data['NovajoinIpaOtp'] = CONF['ipa_otp']
elif CONF.get('ipa_otp'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/undercloud-tls.yaml")]
env_data['UndercloudIpaOtp'] = CONF['ipa_otp']
if CONF.get('enable_zaqar'):
deploy_args += ['-e', os.path.join(