X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-api.yaml;h=2e2d3f2dc4d2363e3a5f6a3c0c2a067e3ca371ee;hb=22ba81cf9dd8b2690c3e8c0eee5a70dcb37e10c4;hp=27c32bfd5af42871bfa73895460cdcd6334eb4df;hpb=b8d23becd1b96ebba0e1e113e9f5a2e80ae1a1a6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 27c32bfd..2e2d3f2d 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -26,7 +26,9 @@ parameters:
     default:
       tag: openstack.ceilometer.api
       path: /var/log/ceilometer/api.log
-
+  EnableInternalTLS:
+    type: boolean
+    default: false
 
 resources:
   CeilometerServiceBase:
@@ -42,6 +44,7 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:
   role_data:
@@ -69,13 +72,18 @@ outputs:
             # internal_api_subnet - > IP/CIDR
           - ceilometer::api::service_name: 'httpd'
             ceilometer::api::enable_proxy_headers_parsing: true
-            ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+            ceilometer::api::host:
+              str_replace:
+                template:
+                  "%{hiera('fqdn_$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
             ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
-            ceilometer::wsgi::apache::ssl: false
+            ceilometer::wsgi::apache::ssl: {get_param: EnableInternalTLS}
             ceilometer::wsgi::apache::servername:
               str_replace:
                 template:
-                  '"%{::fqdn_$NETWORK}"'
+                  "%{hiera('fqdn_$NETWORK')}"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
       service_config_settings: