openstack/devstack
Code Issues Proposed changes

use deprecated function instead of modifying global

Browse Source 
It's safer to run this through a common function to let us make
changes later.

Change-Id: Ic661824027577e1946726c1843a29ac8325915bf
This commit is contained in:
Sean Dague 2015-10-07 11:51:40 -04:00
parent 1de9e330de
commit 72ad942796
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -341,7 +341,7 @@ function use_database {
# No backends registered means this is likely called from ``localrc`` # No backends registered means this is likely called from ``localrc``
# This is now deprecated usage # This is now deprecated usage
DATABASE_TYPE=$1 DATABASE_TYPE=$1
DEPRECATED_TEXT="$DEPRECATED_TEXT\nThe database backend needs to be properly set in ENABLED_SERVICES; use_database is deprecated localrc\n" deprecated "The database backend needs to be properly set in ENABLED_SERVICES; use_database is deprecated localrc"
else else
# This should no longer get called...here for posterity # This should no longer get called...here for posterity
use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1 use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1

2
lib/cinder
View File

@ -93,7 +93,7 @@ if [[ -n $CINDER_SECURE_DELETE ]]; then
if [[ $CINDER_SECURE_DELETE == "False" ]]; then if [[ $CINDER_SECURE_DELETE == "False" ]]; then
CINDER_VOLUME_CLEAR_DEFAULT="none" CINDER_VOLUME_CLEAR_DEFAULT="none"
fi fi
DEPRECATED_TEXT="$DEPRECATED_TEXT\nConfigure secure Cinder volume deletion using CINDER_VOLUME_CLEAR instead of CINDER_SECURE_DELETE.\n" deprecated "Configure secure Cinder volume deletion using CINDER_VOLUME_CLEAR instead of CINDER_SECURE_DELETE."
fi fi
CINDER_VOLUME_CLEAR=${CINDER_VOLUME_CLEAR:-${CINDER_VOLUME_CLEAR_DEFAULT:-zero}} CINDER_VOLUME_CLEAR=${CINDER_VOLUME_CLEAR:-${CINDER_VOLUME_CLEAR_DEFAULT:-zero}}
CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]') CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]')