openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "HAProxy: Mount the CA certificate if TLS everywhere is enabled"

This commit is contained in:
Zuul 2017-11-03 02:53:25 +00:00 committed by Gerrit Code Review
parent a3d1253f80 3de6bc039c
commit 9bd858ebdf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/services/haproxy.yaml
View File

@ -198,16 +198,17 @@ outputs:
- - {get_param: DeployedSSLCertificatePath}
- {get_param: DeployedSSLCertificatePath}
- 'ro'
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/haproxy:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/haproxy:ro
- ''
-
if:
- internal_tls_enabled
-
if:
- internal_tls_enabled
- - /etc/pki/tls/certs/haproxy:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/haproxy:ro
- /etc/pki/tls/private/haproxy:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/haproxy:ro
- ''
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- null
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
metadata_settings: