Merge "Removes EnableODL heat parameter and fixes missing local_ip param"

[apex-tripleo-heat-templates.git] / puppet / services / aodh-api.yaml

diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index c84614b..da043c8 100644 (file)
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -53,7 +53,14 @@ outputs:
           - get_attr: [AodhBase, role_data, config_settings]
           - get_attr: [ApacheServiceBase, role_data, config_settings]
           - aodh::wsgi::apache::ssl: false
+            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:
@@ -68,5 +75,7 @@ outputs:
             aodh::api::host: {get_param: [ServiceNetMap, AodhApiNetwork]}
             aodh::wsgi::apache::bind_host: {get_param: [ServiceNetMap, AodhApiNetwork]}
             tripleo::profile::base::aodh::api::enable_combination_alarms: {get_param: EnableCombinationAlarms}
+      service_config_settings:
+        get_attr: [AodhBase, role_data, service_config_settings]
       step_config: |
         include tripleo::profile::base::aodh::api