summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-16 21:09:15 +0000
committerGerrit Code Review <review@openstack.org>2016-09-16 21:09:15 +0000
commit3031decbe230b9068c6af87004894bca469b1e89 (patch)
treeaeeca818eb31eb43540146bd7e6adb5c4028695b
parent75b7f0f0c84028cb13a15ec96cc913b3c472c564 (diff)
parent3d58b8c7c2251fb886c2b74bfb732cbc3ab2af1b (diff)
Merge "Expose parameter to enable combination alarms"
-rw-r--r--puppet/services/aodh-api.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index 65afffad..c84614ba 100644
--- 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