Merge "Fix the mounting issues for the TLS everywhere deployment" into stable/queens
This commit is contained in:
commit
55988ec965
|
@ -82,6 +82,10 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: Specifies the default CA cert to use if TLS is used for
|
description: Specifies the default CA cert to use if TLS is used for
|
||||||
services in the internal network.
|
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:
|
ConfigDebug:
|
||||||
default: false
|
default: false
|
||||||
description: Whether to run config management (e.g. Puppet) in debug mode.
|
description: Whether to run config management (e.g. Puppet) in debug mode.
|
||||||
|
@ -162,6 +166,11 @@ outputs:
|
||||||
- - {get_param: InternalTLSCAFile}
|
- - {get_param: InternalTLSCAFile}
|
||||||
- {get_param: InternalTLSCAFile}
|
- {get_param: InternalTLSCAFile}
|
||||||
- 'ro'
|
- 'ro'
|
||||||
|
- list_join:
|
||||||
|
- ':'
|
||||||
|
- - {get_param: InternalTLSCRLPEMDir}
|
||||||
|
- {get_param: InternalTLSCRLPEMDir}
|
||||||
|
- 'ro'
|
||||||
- null
|
- null
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/haproxy.json:
|
/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
|
- /etc/pki/tls/private/haproxy:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/haproxy:ro
|
||||||
- list_join:
|
- list_join:
|
||||||
- ':'
|
- ':'
|
||||||
- - {get_param: InternalTLSCAFile}
|
- - {get_param: InternalTLSCRLPEMDir}
|
||||||
- {get_param: InternalTLSCAFile}
|
- {get_param: InternalTLSCRLPEMDir}
|
||||||
- 'ro'
|
- 'ro'
|
||||||
- null
|
- null
|
||||||
environment:
|
environment:
|
||||||
|
|
Loading…
Reference in New Issue