Merge "Adjust CINDER_SECURE_DELETE flag to cinder changes"
diff --git a/lib/cinder b/lib/cinder
index 8949cfc..4aaea5d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -184,6 +184,7 @@
 
     if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then
         iniset $CINDER_CONF DEFAULT secure_delete False
+        iniset $CINDER_CONF DEFAULT volume_clear none
     fi
 
     if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then