openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Make undercloud user-provided cert take precedence"

This commit is contained in:
Zuul 2018-08-01 12:51:16 +00:00 committed by Gerrit Code Review
parent 03254c84f6 ff7200630d
commit 1c9f386a2f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/v1/undercloud_config.py
View File

@ -429,11 +429,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
env_data['BarbicanSimpleCryptoGlobalDefault'] = True
env_data['SwiftEncryptionEnabled'] = True
if CONF.get('generate_service_certificate'):
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/public-tls-undercloud.yaml")]
elif CONF.get('undercloud_service_certificate'):
if CONF.get('undercloud_service_certificate'):
enable_tls_yaml_path = os.path.join(tht_templates,
"environments/ssl/enable-tls.yaml")
env_data.update(
@ -446,6 +442,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
'undercloud-haproxy.yaml'),
'-e', os.path.join(tht_templates, 'environments/services/'
'undercloud-keepalived.yaml')]
elif CONF.get('generate_service_certificate'):
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/public-tls-undercloud.yaml")]
else:
deploy_args += ['-e', os.path.join(
tht_templates,