diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-23 15:51:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-23 15:51:51 +0000 |
| commit | 7787653c89c89d14b65d1babc8f1abe8780ebedf (patch) | |
| tree | 8c02a3d85756e9450199f5887f2f90126b1edb90 /manifests/profile/base | |
| parent | 8e73e53d590fe2e6b10e8d2a7d1feb23c5e6039a (diff) | |
| parent | 343a720d3a274939a876018afe2faaa4c7bedbe4 (diff) | |
Merge "Remove Combination alarms support"
Diffstat (limited to 'manifests/profile/base')
| -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; - } } } |