Merge "Add sahara service support for composable upgrades"
[apex-tripleo-heat-templates.git] / puppet / services / apache-internal-tls-certmonger.yaml
index 87e53f1..07ec1b3 100644 (file)
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   Apache service TLS configurations.
@@ -35,8 +35,8 @@ outputs:
                 httpd-NETWORK:
                   service_certificate: '/etc/pki/tls/certs/httpd-NETWORK.crt'
                   service_key: '/etc/pki/tls/private/httpd-NETWORK.key'
-                  hostname: "%{::fqdn_NETWORK}"
-                  principal: "HTTP/%{::fqdn_NETWORK}"
+                  hostname: "%{hiera('fqdn_NETWORK')}"
+                  principal: "HTTP/%{hiera('fqdn_NETWORK')}"
               for_each:
                 NETWORK:
                   # NOTE(jaosorior) Get unique network names to create