commit 035742cdfde69528b48b0e42f3bd793c770460dd
author Jenkins <jenkins@review.openstack.org> Mon Jul 21 22:12:41 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 21 22:12:41 2014 +0000
tree a6ff70b51344b097de0bda3cf40a3092c4a47254
parent 15ae2101bacd17a3809f868ff2e29a21c9243321
parent 7062b12b9b91a1eb405d7079c62b62b0de59109f

Merge "Fix default_volume_type for Cinder multi backend"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index ce2a5c9..3965687 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -246,13 +246,13 @@
                 configure_cinder_backend_${BE_TYPE} ${BE_NAME}
             fi
             if [[ -z "$default_type" ]]; then
-                default_type=$BE_TYPE}
+                default_type=$BE_TYPE
             fi
             enabled_backends+=$BE_NAME,
         done
         iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
         if [[ -n "$default_type" ]]; then
-            iniset $CINDER_CONF DEFAULT default_volume_type ${enabled_backends%,*}
+            iniset $CINDER_CONF DEFAULT default_volume_type ${default_type}
         fi
     fi