commit 82fbf336a23b19df7f21a86dd3993f282157d8dc
author Jenkins <jenkins@review.openstack.org> Mon Nov 02 20:41:50 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Nov 02 20:41:50 2015 +0000
tree e4d0c09430f7b93b76320cd088b1535e1b170d7f
parent 463a0e6d980690d00b17b9ebcfaf83c2f12d7615
parent cdcdeb64602ea271bedf20f58a9f1ca1c0075c84

Merge "Remove CINDER_VOLUME_CLEAR value validation"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index ed9a103..1307c11 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -317,9 +317,7 @@
 
     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
-    fi
+    iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR
 
     # Format logging
     if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$CINDER_USE_MOD_WSGI" == "False" ]; then