From 5c1f3048f8cf8397884a72d17611cab4928dbcf0 Mon Sep 17 00:00:00 2001 From: Isaac Beckman Date: Tue, 17 Jan 2017 14:52:33 +0200 Subject: [PATCH] cleanup: remove DEVSTACK_CINDER_SECURE_DELETE CINDER_SECURE_DELETE is deprecated in devstack as of liberty Marked to be removed after kilo-eol Change-Id: I987b2938249bb2fde108a733543272d5fcb506f8 --- devstack-vm-gate-wrap.sh | 7 ------- devstack-vm-gate.sh | 3 --- 2 files changed, 10 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 89b7469b..36eaf739 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -186,13 +186,6 @@ export DEVSTACK_GATE_SMOKE_SERIAL=${DEVSTACK_GATE_SMOKE_SERIAL:-0} # for tempest will be the one chosen by devstack. export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION:-0} -# Set to 1 to enable Cinder secure delete. -# False by default to avoid dd problems on Precise. -# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1023755 -# TODO(mriedem): CINDER_SECURE_DELETE is deprecated in devstack as of liberty. -# Remove after kilo-eol happens in devstack. -export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0} - # Should cinder perform secure deletion of volumes? # Defaults to none to avoid bug 1023755. Can also be set to zero or shred. # Only applicable to stable/liberty+ devstack. diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index c5fd5a2a..5e1893a5 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -394,9 +394,6 @@ function setup_localrc { localrc_set "$localrc_file" "PUBLIC_BRIDGE_MTU" "$EXTERNAL_BRIDGE_MTU" fi - if [[ "$DEVSTACK_CINDER_SECURE_DELETE" -eq "0" ]]; then - localrc_set "$localrc_file" "CINDER_SECURE_DELETE" "False" - fi localrc_set "$localrc_file" "CINDER_VOLUME_CLEAR" "${DEVSTACK_CINDER_VOLUME_CLEAR}" if [[ "$DEVSTACK_GATE_TEMPEST_HEAT_SLOW" -eq "1" ]]; then