openstack
/
devstack-gate
Code Issues Proposed changes

Merge "cleanup: remove DEVSTACK_CINDER_SECURE_DELETE"

This commit is contained in:
Jenkins 2017-06-13 14:55:13 +00:00 committed by Gerrit Code Review
parent bccf691bd1 5c1f3048f8
commit 0dbc316dab
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack-vm-gate-wrap.sh
View File

@ -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.

3
devstack-vm-gate.sh
View File

@ -408,9 +408,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