commit e4414523cd40c776b94b5b9f7ddbc83277c07cec
author Jenkins <jenkins@review.openstack.org> Thu Mar 12 08:05:13 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 12 08:05:14 2015 +0000
tree 6fa8aee36dad54be8872de6140f7a7ad9f16e44f
parent df5c744450e533e2b9516ece2b6ec52291eca82c
parent b66c94ea25f45fdc9a074a7ceb296faae70d318a

Merge "Add support to the services decorator for trove"

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index d6858a3..7039f4c 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -94,7 +94,8 @@
         'object_storage': CONF.service_available.swift,
         'dashboard': CONF.service_available.horizon,
         'telemetry': CONF.service_available.ceilometer,
-        'data_processing': CONF.service_available.sahara
+        'data_processing': CONF.service_available.sahara,
+        'database': CONF.service_available.trove
     }
     return service_list
 
@@ -108,7 +109,7 @@
     def decorator(f):
         services = ['compute', 'image', 'baremetal', 'volume', 'orchestration',
                     'network', 'identity', 'object_storage', 'dashboard',
-                    'telemetry', 'data_processing']
+                    'telemetry', 'data_processing', 'database']
         for service in args:
             if service not in services:
                 raise exceptions.InvalidServiceTag('%s is not a valid '