Merge "Move rabbit's clustering port away from the ephemeral port range"

[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 65afffa..c84614b 100644 (file)
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -21,6 +21,11 @@ parameters:
   MonitoringSubscriptionAodhApi:
     default: 'overcloud-ceilometer-aodh-api'
     type: string
+  EnableCombinationAlarms:
+    default: false
+    description: Combination alarms are deprecated in Newton, hence disabled
+                 by default. To enable, set this parameter to true.
+    type: boolean
 
 resources:
   AodhBase:
@@ -62,5 +67,6 @@ outputs:
             # internal_api_subnet - > IP/CIDR
             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}
       step_config: |
         include tripleo::profile::base::aodh::api