diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-11-16 16:10:57 -0500 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-11-17 08:24:37 -0500 |
| commit | 343a720d3a274939a876018afe2faaa4c7bedbe4 (patch) | |
| tree | 8e52261655a42bd9c9ec3ea2ff3b32404fb2a8fd /manifests | |
| parent | a63f799dbfb1a6cabb1ec18d929fa682fbf30289 (diff) | |
Remove Combination alarms support
combination alarms are completely removed in Ocata.
Remove this from tripleo.
Change-Id: Icdf81d2f489db33533a1a0979cba3b5a652535d5
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/aodh/api.pp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp index 06dcfe5..af4a5b3 100644 --- a/manifests/profile/base/aodh/api.pp +++ b/manifests/profile/base/aodh/api.pp @@ -52,10 +52,6 @@ # 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 ( $aodh_network = hiera('aodh_api_network', undef), @@ -63,7 +59,6 @@ class tripleo::profile::base::aodh::api ( $enable_internal_tls = hiera('enable_internal_tls', false), $generate_service_certificates = hiera('generate_service_certificates', false), $step = hiera('step'), - $enable_combination_alarms = false, ) { include ::tripleo::profile::base::aodh @@ -90,12 +85,5 @@ class tripleo::profile::base::aodh::api ( ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, } - - #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; - } } } |