Browse code
Remove CINDER_VOLUME_CLEAR value validation
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
Matt Riedemann authored on 2015/10/30 01:48:17Showing 1 changed files
| ... | ... |
@@ -317,9 +317,7 @@ function configure_cinder {
|
| 317 | 317 |
|
| 318 | 318 |
iniset_rpc_backend cinder $CINDER_CONF |
| 319 | 319 |
|
| 320 |
- if [[ "$CINDER_VOLUME_CLEAR" == "none" ]] || [[ "$CINDER_VOLUME_CLEAR" == "zero" ]] || [[ "$CINDER_VOLUME_CLEAR" == "shred" ]]; then |
|
| 321 |
- iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR |
|
| 322 |
- fi |
|
| 320 |
+ iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR |
|
| 323 | 321 |
|
| 324 | 322 |
# Format logging |
| 325 | 323 |
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$CINDER_USE_MOD_WSGI" == "False" ]; then |