From 855947696b404f17f76594cb1f195c4e59745c47 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 15 Nov 2024 11:05:59 +0900
Subject: [PATCH] Replace deprecated configure_auth_token_middleware

It was deprecated some years ago by [1].

[1] https://review.opendev.org/628651

Change-Id: I08591e4918a63a0f30156fa61d891a391b844dd6
---
 devstack/plugin.sh | 6 +-----
 devstack/settings  | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ce7e14eb2..cfe79f6ea 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -224,7 +224,7 @@ function configure_vitrage {
     # copy datasources
     cp $VITRAGE_DIR/etc/vitrage/datasources_values/*.yaml $VITRAGE_CONF_DIR/datasources_values
 
-    configure_auth_token_middleware $VITRAGE_CONF vitrage $VITRAGE_AUTH_CACHE_DIR
+    configure_keystone_authtoken_middleware $VITRAGE_CONF vitrage
 
     iniset $VITRAGE_CONF "keystone_authtoken" password $ADMIN_PASSWORD
     iniset $VITRAGE_CONF "keystone_authtoken" user_domain_name $admin_domain_name
@@ -258,10 +258,6 @@ function init_vitrage {
             $VITRAGE_BIN_DIR/vitrage-dbsync
         fi
     fi
-    # Create cache dir
-    sudo install -d -o $STACK_USER $VITRAGE_AUTH_CACHE_DIR
-    rm -f $VITRAGE_AUTH_CACHE_DIR/*
-
 }
 
 # Install Vitrage.
diff --git a/devstack/settings b/devstack/settings
index 220e480b2..fd9245151 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,7 +16,6 @@ enable_service vitrage-snmp-parsing
 VITRAGE_DIR=$DEST/vitrage
 VITRAGE_CONF_DIR=/etc/vitrage
 VITRAGE_CONF=$VITRAGE_CONF_DIR/vitrage.conf
-VITRAGE_AUTH_CACHE_DIR=${VITRAGE_AUTH_CACHE_DIR:-/var/cache/vitrage}
 VITRAGE_WSGI_DIR=${VITRAGE_WSGI_DIR:-/var/www/vitrage}
 VITRAGE_UWSGI_FILE=$VITRAGE_CONF_DIR/vitrage-uwsgi.ini
 VITRAGE_PUBLIC_UWSGI=$VITRAGE_DIR/vitrage/api/app.wsgi