From 40718dafb5425442259573453fa9e531b731ddb4 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 23 Aug 2016 15:31:19 -0400 Subject: 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 --- manifests/profile/base/aodh/api.pp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'manifests/profile/base/aodh') 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; + } } } -- cgit 1.2.3-korg