Browse code

Merge "Update multiple backend configuration in tempest script"

Jenkins authored on 2014/10/23 20:50:08
Showing 1 changed files
... ...
@@ -28,6 +28,7 @@
28 28
 # - ``DEFAULT_INSTANCE_TYPE``
29 29
 # - ``DEFAULT_INSTANCE_USER``
30 30
 # - ``CINDER_MULTI_LVM_BACKEND``
31
+# - ``CINDER_ENABLED_BACKENDS``
31 32
 #
32 33
 # ``stack.sh`` calls the entry points in this order:
33 34
 #
... ...
@@ -364,11 +365,17 @@ function configure_tempest {
364 364
     if ! is_service_enabled c-bak; then
365 365
         iniset $TEMPEST_CONFIG volume-feature-enabled backup False
366 366
     fi
367
-    CINDER_MULTI_LVM_BACKEND=$(trueorfalse False $CINDER_MULTI_LVM_BACKEND)
368
-    if [ $CINDER_MULTI_LVM_BACKEND == "True" ]; then
367
+
368
+    # Using CINDER_ENABLED_BACKENDS
369
+    if [[ -n "$CINDER_ENABLED_BACKENDS" ]] && [[ $CINDER_ENABLED_BACKENDS =~ .*,.* ]]; then
369 370
         iniset $TEMPEST_CONFIG volume-feature-enabled multi_backend "True"
370
-        iniset $TEMPEST_CONFIG volume backend1_name "LVM_iSCSI"
371
-        iniset $TEMPEST_CONFIG volume backend2_name "LVM_iSCSI_2"
371
+        local i=1
372
+        local be
373
+        for be in ${CINDER_ENABLED_BACKENDS//,/ }; do
374
+            local be_name=${be##*:}
375
+            iniset $TEMPEST_CONFIG volume "backend${i}_name" "$be_name"
376
+            i=$(( i + 1 ))
377
+        done
372 378
     fi
373 379
 
374 380
     if [ $TEMPEST_VOLUME_DRIVER != "default" -o \