summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-08-23 15:31:19 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2016-08-23 15:31:19 -0400
commit40718dafb5425442259573453fa9e531b731ddb4 (patch)
treed606c90a133d1c2decb3a0ec0f539ad44f6a3977
parentc16ae9c5efdb2f6e3e82f4a6e18d8d5886f2359e (diff)
Expose enable_combination_alarm setting
Combination alarms are deprecated in Newton and hence turned off by default. This allows users still using this type of alarms to flip the flag and use until they migrate themselves to composite alarms. Change-Id: I9220b7d020dc8ed45dd6ca83ea9647efd67ea648
-rw-r--r--manifests/profile/base/aodh/api.pp15
1 files changed, 14 insertions, 1 deletions
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 3c4c0b6..2dcf802 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -23,8 +23,14 @@
# for more details.
# Defaults to hiera('step')
#
+# [*enable_combination_alarms*]
+# (optional) Setting to enable combination alarms
+# Defaults to: false
+#
+
class tripleo::profile::base::aodh::api (
- $step = hiera('step'),
+ $step = hiera('step'),
+ $enable_combination_alarms = false,
) {
include ::tripleo::profile::base::aodh
@@ -32,5 +38,12 @@ class tripleo::profile::base::aodh::api (
if $step >= 4 {
include ::aodh::api
include ::aodh::wsgi::apache
+
+ #NOTE: Combination alarms are deprecated in newton and disabled by default.
+ # we need a way to override this setting for users still using this type
+ # of alarms.
+ aodh_config {
+ 'api/enable_combination_alarms' : value => $enable_combination_alarms;
+ }
}
}