openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable crl file in non-pacemaker haproxy too"

This commit is contained in:
Zuul 2022-05-25 21:24:12 +00:00 committed by Gerrit Code Review
parent 013d610c68 e0a3385657
commit 438efd8c5f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -201,7 +201,8 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, HaproxyNetwork]}
tripleo::haproxy::redis_password: {get_param: RedisPassword}
tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile}
# disable the use CRL file until we can restart the container when the file expires
tripleo::haproxy::crl_file: null
tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled}
enable_load_balancer: {get_param: EnableLoadBalancer}
tripleo::profile::base::haproxy::certificates_specs:

2
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -215,8 +215,6 @@ outputs:
- get_param: HAProxyInternalTLSCertsDirectory
tripleo::profile::pacemaker::haproxy_bundle::internal_certs_directory: {get_param: HAProxyInternalTLSCertsDirectory}
tripleo::profile::pacemaker::haproxy_bundle::internal_keys_directory: {get_param: HAProxyInternalTLSKeysDirectory}
# disable the use CRL file until we can restart the container when the file expires
tripleo::haproxy::crl_file: null
tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image_pcmklatest
if:
- {get_param: ClusterFullTag}