Merge "Configure volume_clear setting per backend"

This commit is contained in:
Jenkins 2017-05-31 05:14:58 +00:00 committed by Gerrit Code Review
commit b3ced44e37

View File

@ -289,6 +289,9 @@ function configure_cinder {
default_name=$be_name
fi
enabled_backends+=$be_name,
iniset $CINDER_CONF $be_name volume_clear $CINDER_VOLUME_CLEAR
done
iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
if [[ -n "$default_name" ]]; then
@ -318,8 +321,6 @@ function configure_cinder {
iniset_rpc_backend cinder $CINDER_CONF
iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR
# Format logging
setup_logging $CINDER_CONF $CINDER_USE_MOD_WSGI