Fix default_volume_type for Cinder multi backend

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 <sebastien.han@enovance.com>
This commit is contained in:
Sébastien Han 2014-07-16 09:37:41 +02:00
parent 5e93727a23
commit 7062b12b9b

View File

@ -246,13 +246,13 @@ function configure_cinder {
configure_cinder_backend_${BE_TYPE} ${BE_NAME} configure_cinder_backend_${BE_TYPE} ${BE_NAME}
fi fi
if [[ -z "$default_type" ]]; then if [[ -z "$default_type" ]]; then
default_type=$BE_TYPE} default_type=$BE_TYPE
fi fi
enabled_backends+=$BE_NAME, enabled_backends+=$BE_NAME,
done done
iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*} iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
if [[ -n "$default_type" ]]; then 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
fi fi