From 343a720d3a274939a876018afe2faaa4c7bedbe4 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 16 Nov 2016 16:10:57 -0500
Subject: Remove Combination alarms support

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

Change-Id: Icdf81d2f489db33533a1a0979cba3b5a652535d5
---
 manifests/profile/base/aodh/api.pp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'manifests')

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;
-    }
   }
 }
-- 
cgit 1.2.3-korg