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

@@ -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:]')