openstack
/
python-tripleoclient
Code Issues Proposed changes

Detect TLS for pre-provisioned nodes 

In cases where we need to support TLS for pre-provisioned nodes, we need
to be able to enroll hosts without using novajoin. This commit detects
if an OTP is present but without novajoin enabled. If so, if uses a
separate composible service, without novajoin, to enroll the undercloud
as a FreeIPA host.

Change-Id: Id6d193ab10e43a5d2706705588269654073910cc
(cherry picked from commit 97d54f2b39)
This commit is contained in:
Dave Wilde (d34dh0r53) 2020-05-15 14:17:21 -05:00
parent 19a26f32ae
commit fca6d30b59
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

@ -633,6 +633,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(