From 87a4e8128de5392e31a2107e0690be8135c09ab8 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Tue, 5 Mar 2019 12:26:06 +0000
Subject: [PATCH] Remove aodh_plugin option

aodh_plugin option under service_available section is
deprecated since telemetry-tempest-plugin version 0.2.0 [1]
which is available since queens [2].

[1] https://github.com/openstack/telemetry-tempest-plugin/
    blob/0.2.0/telemetry_tempest_plugin/config.py#L31
[2] https://github.com/redhat-openstack/rdoinfo/blob/
    2c479b4311b7f8840576b891f6f955bbe1880c65/tags/queens.yml#L1042

Change-Id: I44b456c8ec98b11e0c865ffda7b311bc2c917b19
---
 config_tempest/services/alarming.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/config_tempest/services/alarming.py b/config_tempest/services/alarming.py
index a7e51ee8..d186ad0d 100644
--- a/config_tempest/services/alarming.py
+++ b/config_tempest/services/alarming.py
@@ -18,16 +18,10 @@ from config_tempest.services.base import Service
 
 class AlarmingService(Service):
 
-    def set_availability(self, conf, available):
-        # TODO(arxcruz): Remove this once/if we get the following reviews
-        # merged in all branches supported by tempestconf, or once/if
-        # tempestconf do not support anymore the OpenStack release where
-        # those patches are not available.
-        # https://review.openstack.org/#/c/492526/
-        # https://review.openstack.org/#/c/492525/
-        conf.set('service_available', 'aodh', str(available))
-        conf.set('service_available', 'aodh_plugin', str(available))
-
     @staticmethod
     def get_service_name():
         return ['aodh']
+
+    @staticmethod
+    def get_codename():
+        return 'aodh'