openstack/devstack
Code Issues Proposed changes

Merge "Configure volume_clear setting per backend"

Browse Source
This commit is contained in:
Jenkins 2017-05-31 05:14:58 +00:00 committed by Gerrit Code Review
commit b3ced44e37
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cinder
View File

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