Merge "Fix tempest.conf generation"
diff --git a/ceilometer/tests/tempest/plugin.py b/ceilometer/tests/tempest/plugin.py
index 077a3c2..1a7aa10 100644
--- a/ceilometer/tests/tempest/plugin.py
+++ b/ceilometer/tests/tempest/plugin.py
@@ -40,5 +40,8 @@
                                   tempest_config.TelemetryGroup)
 
     def get_opt_lists(self):
-        return [(tempest_config.telemetry_group.name,
-                 tempest_config.TelemetryGroup)]
+        return [
+            (tempest_config.telemetry_group.name,
+             tempest_config.TelemetryGroup),
+            ('service_available', tempest_config.ServiceAvailableGroup)
+        ]