openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Detect TLS for pre-provisioned nodes" into stable/train

This commit is contained in:
Zuul 2020-06-26 01:11:25 +00:00 committed by Gerrit Code Review
parent d58ea5bbb0 4b1a018ef2
commit 5c60a8f8a5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/v1/undercloud_config.py
View File

@ -621,6 +621,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/novajoin.yaml")] tht_templates, "environments/services/novajoin.yaml")]
env_data['NovajoinIpaOtp'] = CONF['ipa_otp'] 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'): if CONF.get('enable_zaqar'):
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(