openstack/devstack
Code Issues Proposed changes

Remove CINDER_VOLUME_CLEAR value validation

Browse Source 
132fbcd38ebae52bdd20da54905131b75581520f in cinder changed the
volume_clear StrOpt to use the choices kwarg which enforces the value
specified and raises a ValueError if an invalid value is set for the
option in cinder.conf.

This lets us remove the validation that devstack was doing.

Change-Id: Ia7eead6297ed0f3a972de2021170fe9c7225e856
This commit is contained in:
Matt Riedemann 2015-10-29 09:48:17 -07:00
parent b37ca0f7b4
commit cdcdeb6460
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