X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Faodh-api.yaml;h=347a8c13efbcef12dd073848fa074d9f57919d26;hb=ea3ace78398015578de77be5a782dfa6176decb7;hp=cc1f4b095b56fea982012ce9915bf1b09ae34376;hpb=5b6b5e9f7262671c126b024d18dd02e7b2429bf0;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index cc1f4b09..347a8c13 100644
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -18,6 +18,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionAodhApi:
+    default: 'overcloud-ceilometer-aodh-api'
+    type: string
+  EnableInternalTLS:
+    type: boolean
+    default: false
 
 resources:
   AodhBase:
@@ -33,30 +39,46 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:
   role_data:
     description: Role data for the Aodh API service.
     value:
       service_name: aodh_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionAodhApi}
       config_settings:
         map_merge:
           - get_attr: [AodhBase, role_data, config_settings]
           - get_attr: [ApacheServiceBase, role_data, config_settings]
-          - aodh::wsgi::apache::ssl: false
+          - aodh::wsgi::apache::ssl: {get_param: EnableInternalTLS}
+            aodh::wsgi::apache::servername:
+              str_replace:
+                template:
+                  '%{::fqdn_$NETWORK}'
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
             aodh::api::service_name: 'httpd'
+            aodh::api::enable_proxy_headers_parsing: true
             tripleo.aodh_api.firewall_rules:
               '128 aodh-api':
                 dport:
                   - 8042
                   - 13042
+            aodh::api::host:
+              str_replace:
+                template:
+                  '%{::fqdn_$NETWORK}'
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples
             # (eg. for internal_api):
             # internal_api -> IP
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
-            aodh::api::host: {get_param: [ServiceNetMap, AodhApiNetwork]}
             aodh::wsgi::apache::bind_host: {get_param: [ServiceNetMap, AodhApiNetwork]}
+      service_config_settings:
+        get_attr: [AodhBase, role_data, service_config_settings]
       step_config: |
         include tripleo::profile::base::aodh::api