Merge aodh tempest tests and configuration in ceilometer
* In order to achieve the tempest plugin split goal, we are merging
the aodh tempest tests and config in to ceilometer, then we can move
all the telemetry tests in a single repo.
Change-Id: I4e0952487d0fe73992e8fe9d6ddda3f98054ec60
diff --git a/ceilometer/tests/tempest/plugin.py b/ceilometer/tests/tempest/plugin.py
index 19fcf68..e529011 100644
--- a/ceilometer/tests/tempest/plugin.py
+++ b/ceilometer/tests/tempest/plugin.py
@@ -41,6 +41,9 @@
config.register_opt_group(
conf, tempest_config.event_group,
tempest_config.event_opts)
+ config.register_opt_group(
+ conf, tempest_config.alarming_group,
+ tempest_config.AlarmingGroup)
def get_opt_lists(self):
return [(tempest_config.telemetry_group.name,
@@ -48,4 +51,6 @@
(tempest_config.event_group.name,
tempest_config.event_opts),
(config.service_available_group.name,
- tempest_config.service_option)]
+ tempest_config.service_option),
+ (tempest_config.alarming_group.name,
+ tempest_config.AlarmingGroup)]