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:
parent
ecf2241668
commit
4b1a018ef2
|
@ -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(
|
||||||
|
|
Loading…
Reference in New Issue