commit 2bf23de22b2ce5176c8aec1aec02b3fa65a65639
author Jenkins <jenkins@review.openstack.org> Sat Feb 22 05:05:08 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Feb 22 05:05:08 2014 +0000
tree 46fd1d61dcbf31c0f63a9dbe3bce5ea5e3de179f
parent acdc1189f6a6afcb5373583c3f9d87a7b40ad6d5
parent 3d60f4dd531388cd01a3aa689053dfc22acbd16c

Merge "Disable tempest backup tests if c-bak unavailable"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index c8eebfc..596750b 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -314,8 +314,8 @@
     iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0}
 
     # Volume
-    if is_service_enabled c-bak; then
-        iniset $TEMPEST_CONFIG volume volume_backup_enabled "True"
+    if ! is_service_enabled c-bak; then
+        iniset $TEMPEST_CONFIG volume-feature-enabled backup False
     fi
     CINDER_MULTI_LVM_BACKEND=$(trueorfalse False $CINDER_MULTI_LVM_BACKEND)
     if [ $CINDER_MULTI_LVM_BACKEND == "True" ]; then