openstack/devstack
Code Issues Proposed changes

Merge "Remove CINDER_VOLUME_CLEAR value validation"

Browse Source
This commit is contained in:
Jenkins 2015-11-02 20:41:50 +00:00 committed by Gerrit Code Review
commit 82fbf336a2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cinder
View File

@ -317,9 +317,7 @@ function configure_cinder {
iniset_rpc_backend cinder $CINDER_CONF iniset_rpc_backend cinder $CINDER_CONF
if [[ "$CINDER_VOLUME_CLEAR" == "none" ]] || [[ "$CINDER_VOLUME_CLEAR" == "zero" ]] || [[ "$CINDER_VOLUME_CLEAR" == "shred" ]]; then
iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR
fi
# Format logging # Format logging
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$CINDER_USE_MOD_WSGI" == "False" ]; then if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$CINDER_USE_MOD_WSGI" == "False" ]; then