openstack/puppet-tripleo
Code Issues Proposed changes

Remove Combination alarms support

Browse Source 
combination alarms are completely removed in Ocata.
Remove this from tripleo.

Change-Id: Icdf81d2f489db33533a1a0979cba3b5a652535d5
This commit is contained in:
Pradeep Kilambi 2016-11-16 16:10:57 -05:00
parent a63f799dbf
commit 343a720d3a
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/profile/base/aodh/api.pp
View File

@ -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;
}
}
}

16
spec/classes/tripleo_profile_base_aodh_api_spec.rb
View File

@ -30,7 +30,6 @@ describe 'tripleo::profile::base::aodh::api' do
is_expected.to contain_class('tripleo::profile::base::aodh')
is_expected.to_not contain_class('aodh::api')
is_expected.to_not contain_class('aodh::wsgi::apache')
is_expected.to_not contain_aodh_config('api/enable_combination_alarms')
end
end
@ -42,23 +41,8 @@ describe 'tripleo::profile::base::aodh::api' do
it 'should trigger complete configuration' do
is_expected.to contain_class('aodh::api')
is_expected.to contain_class('aodh::wsgi::apache')
is_expected.to contain_aodh_config('api/enable_combination_alarms').with_value('false')
end
end
context 'with step 4 and enable combo alarms' do
let(:params) { {
:step => 4,
:enable_combination_alarms => true
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('aodh::api')
is_expected.to contain_class('aodh::wsgi::apache')
is_expected.to contain_aodh_config('api/enable_combination_alarms').with_value('true')
end
end
end