openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "undercloud-post: Discard CA usage if not set"

This commit is contained in:
Zuul 2018-08-09 01:03:23 +00:00 committed by Gerrit Code Review
parent 9359e7ac46 b633eaf73a
commit 893599e806
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -85,6 +85,13 @@ conditions:
- {get_param: PublicSSLCertificateAutogenerated}
- true
ca_file_enabled:
and:
- not:
equals:
- {get_param: InternalTLSCAFile}
- ""
- tls_enabled
resources:
@ -115,7 +122,7 @@ resources:
enable_validations: [get_params: EnableValidations]
internal_tls_ca_file:
if:
- tls_enabled
- ca_file_enabled
- {get_param: InternalTLSCAFile}
- ''
# if SSL is enabled we use the public virtual ip as the stackrc endpoint