From 72ad942796adb03c96154cd1df4f97ad775e6092 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 7 Oct 2015 11:51:40 -0400 Subject: [PATCH] use deprecated function instead of modifying global It's safer to run this through a common function to let us make changes later. Change-Id: Ic661824027577e1946726c1843a29ac8325915bf --- functions | 2 +- lib/cinder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions b/functions index ff95c89ad9..3e17f2f9e9 100644 --- a/functions +++ b/functions @@ -341,7 +341,7 @@ function use_database { # No backends registered means this is likely called from ``localrc`` # This is now deprecated usage 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 # This should no longer get called...here for posterity use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1 diff --git a/lib/cinder b/lib/cinder index 10144117ec..2cda8b7841 100644 --- a/lib/cinder +++ b/lib/cinder @@ -93,7 +93,7 @@ if [[ -n $CINDER_SECURE_DELETE ]]; then if [[ $CINDER_SECURE_DELETE == "False" ]]; then CINDER_VOLUME_CLEAR_DEFAULT="none" 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 CINDER_VOLUME_CLEAR=${CINDER_VOLUME_CLEAR:-${CINDER_VOLUME_CLEAR_DEFAULT:-zero}} CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]')