X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fhaproxy-public-tls-certmonger.yaml;h=cdfc41cfde25f30db3cfecdd2d2ad025eb5e9aee;hb=83f0086a6a4265ba4d13220d5f1741243fd2a881;hp=e79d2aec3701f538a0e3737a67e56ebf93ba45c4;hpb=58e04d321b331ef93869a1e295523f3b3a28786b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/haproxy-public-tls-certmonger.yaml b/puppet/services/haproxy-public-tls-certmonger.yaml
index e79d2aec..cdfc41cf 100644
--- a/puppet/services/haproxy-public-tls-certmonger.yaml
+++ b/puppet/services/haproxy-public-tls-certmonger.yaml
@@ -30,6 +30,17 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  HAProxyInternalTLSCertsDirectory:
+    default: '/etc/pki/tls/certs/haproxy'
+    type: string
+  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:
@@ -38,14 +49,25 @@ outputs:
       service_name: haproxy_public_tls_certmonger
       config_settings:
         generate_service_certificates: true
-        tripleo::haproxy::service_certificate: '/etc/pki/tls/certs/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: '/etc/pki/tls/certs/overcloud-haproxy-external.pem'
-          service_certificate: '/etc/pki/tls/certs/overcloud-haproxy-external.crt'
-          service_key: '/etc/pki/tls/private/overcloud-haproxy-external.key'
+          service_pem: {get_param: DeployedSSLCertificatePath}
+          service_certificate:
+            list_join:
+            - ''
+            - - {get_param: HAProxyInternalTLSCertsDirectory}
+              - '/overcloud-haproxy-external.crt'
+          service_key:
+            list_join:
+            - ''
+            - - {get_param: HAProxyInternalTLSKeysDirectory}
+              - '/overcloud-haproxy-external.key'
           hostname: "%{hiera('cloud_name_external')}"
-          postsave_cmd: "" # TODO
           principal: "haproxy/%{hiera('cloud_name_external')}"
       metadata_settings:
         - service: haproxy