Merge "Use DeployedSSLCertificatePath for public TLS via certmonger" into stable/pike

1 files changed, 7 insertions, 10 deletions

diff --git a/puppet/services/haproxy-public-tls-certmonger.yaml b/puppet/services/haproxy-public-tls-certmonger.yaml
index 14d171dc..cdfc41cf 100644
--- a/puppet/services/haproxy-public-tls-certmonger.yaml
+++ b/puppet/services/haproxy-public-tls-certmonger.yaml
@@ -36,6 +36,11 @@ parameters:
   HAProxyInternalTLSKeysDirectory:
     default: '/etc/pki/tls/private/haproxy'
     type: string
+  DeployedSSLCertificatePath:
+    default: '/etc/pki/tls/private/overcloud_endpoint.pem'
+    description: >
+        The filepath of the certificate as it will be stored in the controller.
+    type: string
 
 outputs:
   role_data:
@@ -44,22 +49,14 @@ outputs:
       service_name: haproxy_public_tls_certmonger
       config_settings:
         generate_service_certificates: true
-        tripleo::haproxy::service_certificate:
-          list_join:
-          - ''
-          - - {get_param: HAProxyInternalTLSCertsDirectory}
-            - '/overcloud-haproxy-external.pem'
+        tripleo::haproxy::service_certificate: {get_param: DeployedSSLCertificatePath}
         tripleo::certmonger::haproxy_dirs::certificate_dir:
           get_param: HAProxyInternalTLSCertsDirectory
         tripleo::certmonger::haproxy_dirs::key_dir:
           get_param: HAProxyInternalTLSKeysDirectory
       certificates_specs:
         haproxy-external:
-          service_pem:
-            list_join:
-            - ''
-            - - {get_param: HAProxyInternalTLSCertsDirectory}
-              - '/overcloud-haproxy-external.pem'
+          service_pem: {get_param: DeployedSSLCertificatePath}
           service_certificate:
             list_join:
             - ''