Merge "Remove Combination alarms support"

2 files changed, 0 insertions, 28 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;
-    }
   }
 }
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index d1f0b6b..63dbe71 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -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