commit eac9370a12c1491643457e576613c8368b8037c8
author Pádraig Brady <pbrady@redhat.com> Wed Jan 02 16:02:54 2013 +0000
committer Pádraig Brady <P@draigBrady.com> Wed Jan 02 16:09:52 2013 +0000
tree 5c9c66957a7bcf3e028911a4c4f5acb5fe8b20d8
parent 3a30b06daf8a1f5a1b06480b53d6c31e47f40200

Adjust CINDER_SECURE_DELETE flag to cinder changes

Cater for the pending more general cinder support
for configurable volume wiping method at:
https://review.openstack.org/#/c/12521

This change is done here first so as to not
trigger a CI lockup when the referenced patch above lands.
When that's in place, we can remove the older
secure_delete config adjustment in a subsequent patch.

Change-Id: I73fe2e0d1cf2815ab6025121584951cb5ff56fa3

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 701effd..e3df98a 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -169,6 +169,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