aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-08-31 11:26:50 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2016-09-14 12:15:25 +0000
commit3d58b8c7c2251fb886c2b74bfb732cbc3ab2af1b (patch)
tree8820c7abea5fa99e2e42d978476ab99636510a05 /puppet/services
parent89f9a3f2e0274169f305a503f642867ef14244e1 (diff)
Expose parameter to enable combination alarms
The puppet-tripleo change for the same is merged I9220b7d020dc8ed45dd6ca83ea9647efd67ea648 Change-Id: Ic5309ada98c78a15aa3a47dd94acb9e68eb25295
Diffstat (limited to 'puppet/services')
-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