openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix the mounting issues for the TLS everywhere deployment" into stable/queens

This commit is contained in:
Zuul 2020-05-21 16:53:42 +00:00 committed by Gerrit Code Review
parent 54b916ef72 b9ab64afa4
commit 55988ec965
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/services/haproxy.yaml
View File

@ -82,6 +82,10 @@ parameters:
type: string
description: Specifies the default CA cert to use if TLS is used for
services in the internal network.
InternalTLSCRLPEMDir:
default: '/etc/pki/CA/crl/'
type: string
description: The directory of the CRL PEM file to be mounted.
ConfigDebug:
default: false
description: Whether to run config management (e.g. Puppet) in debug mode.
@ -162,6 +166,11 @@ outputs:
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- list_join:
- ':'
- - {get_param: InternalTLSCRLPEMDir}
- {get_param: InternalTLSCRLPEMDir}
- 'ro'
- null
kolla_config:
/var/lib/kolla/config_files/haproxy.json:
@ -247,8 +256,8 @@ outputs:
- /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}
- - {get_param: InternalTLSCRLPEMDir}
- {get_param: InternalTLSCRLPEMDir}
- 'ro'
- null
environment: