summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 17:48:09 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 17:48:09 +0000
commitf5a92ae9cb1cfedb946d4bec0a330c97d907ed7f (patch)
treedfc64ea3daa456ca7fe327a4aecee21b52854da8
parent744b15e141b487a9f560e80f85cb092396393f8b (diff)
parent6bed7525fcfe32108ab797e88c5bf73c0f8fff83 (diff)
Merge "Mount public certificate in haproxy init container" into stable/pike
-rw-r--r--docker/services/pacemaker/haproxy.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 2e5c7424..3cdc5255 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -88,6 +88,7 @@ outputs:
- get_param: InternalTLSCAFile
- get_param: HAProxyInternalTLSKeysDirectory
- get_param: HAProxyInternalTLSCertsDirectory
+ - get_param: DeployedSSLCertificatePath
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