commit b200b1d4dda4e60bacd921f98e4e47d5b4f046d9
author Jenkins <jenkins@review.openstack.org> Tue Jan 14 00:07:33 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 14 00:07:33 2014 +0000
tree 6cc5c0f4f4881fe89f4d82fb838e21c204ce2d56
parent e5a5fe33e09bd4e2604f86a20b21e78dd7be09b2
parent 38d1f2339a88c389e4be44fc00e59f25a62fec14

Merge "Add Marconi to Tempest config"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 08c0553..ef9dfe2 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -329,7 +329,7 @@
     iniset $TEMPEST_CONF network-feature-enabled api_extensions "${NETWORK_API_EXTENSIONS:-all}"
 
     # service_available
-    for service in nova cinder glance neutron swift heat horizon ceilometer ironic savanna trove; do
+    for service in nova cinder glance neutron swift heat horizon ceilometer ironic savanna trove marconi; do
         if is_service_enabled $service ; then
             iniset $TEMPEST_CONF service_available $service "True"
         else