From 7062b12b9b91a1eb405d7079c62b62b0de59109f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 16 Jul 2014 09:37:41 +0200 Subject: [PATCH] Fix default_volume_type for Cinder multi backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default_volume_type option doesn't support comma separated arguments. We can only select one default volume type. We have a variable that contains the default volume type, so we simply use it. Closes-Bug: 1342569 Change-Id: Ibd080442f00f3d446ec374fc5906f0778d449007 Signed-off-by: Sébastien Han --- lib/cinder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cinder b/lib/cinder index ce2a5c9d44..3965687e98 100644 --- a/lib/cinder +++ b/lib/cinder @@ -246,13 +246,13 @@ function configure_cinder { 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