Browse code

Merge "Fix default_volume_type for Cinder multi backend"

Jenkins authored on 2014/07/22 07:12:41
Showing 1 changed files
... ...
@@ -246,13 +246,13 @@ function configure_cinder {
246 246
                 configure_cinder_backend_${BE_TYPE} ${BE_NAME}
247 247
             fi
248 248
             if [[ -z "$default_type" ]]; then
249
-                default_type=$BE_TYPE}
249
+                default_type=$BE_TYPE
250 250
             fi
251 251
             enabled_backends+=$BE_NAME,
252 252
         done
253 253
         iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
254 254
         if [[ -n "$default_type" ]]; then
255
-            iniset $CINDER_CONF DEFAULT default_volume_type ${enabled_backends%,*}
255
+            iniset $CINDER_CONF DEFAULT default_volume_type ${default_type}
256 256
         fi
257 257
     fi
258 258