Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 0fd2fda)
Mount public certificate in haproxy init container
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>
Tue, 5 Sep 2017 11:12:58 +0000 (14:12 +0300)
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>
Wed, 6 Sep 2017 10:22:06 +0000 (10:22 +0000)
It's being mounted on the actual haproxy container, but not the init
one.

Change-Id: I66b69e0bb3642dbfeec767ef5216d515786b5b19
Closes-Bug: #1715132
(cherry picked from commit 03622e89ac3037b4d69d913586823e689b210688)

docker/services/pacemaker/haproxy.yaml patch | blob | history

diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 2e5c742..3cdc525 100644 (file)
--- 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