From b974de98ad4d388d41e524abfb98d3b48d4b0b8d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 15 Nov 2024 11:05:09 +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: Iecc1c0fbd46e1771103fa93f6cd195fa7292cfca --- 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 64ae6ecd0..193cd45df 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -64,10 +64,6 @@ function mkdir_chown_stack { # configure_mistral - Set config files, create data dirs, etc function configure_mistral { - # create and clean up auth cache dir - mkdir_chown_stack "$MISTRAL_AUTH_CACHE_DIR" - rm -f "$MISTRAL_AUTH_CACHE_DIR"/* - mkdir_chown_stack "$MISTRAL_CONF_DIR" # Generate Mistral configuration file and configure common parameters. @@ -81,7 +77,7 @@ function configure_mistral { #------------------------- # Setup keystone_authtoken section - configure_auth_token_middleware $MISTRAL_CONF_FILE mistral $MISTRAL_AUTH_CACHE_DIR + configure_keystone_authtoken_middleware $MISTRAL_CONF_FILE mistral iniset $MISTRAL_CONF_FILE keystone_authtoken www_authenticate_uri $KEYSTONE_AUTH_URI_V3 # Setup RabbitMQ credentials diff --git a/devstack/settings b/devstack/settings index 7bf0c60c0..403211300 100644 --- a/devstack/settings +++ b/devstack/settings @@ -37,7 +37,6 @@ MISTRAL_DASHBOARD_DIR=${DEST}/mistral-dashboard MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral} MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf MISTRAL_DEBUG=${MISTRAL_DEBUG:-True} -MISTRAL_AUTH_CACHE_DIR=${MISTRAL_AUTH_CACHE_DIR:-/var/cache/mistral} MISTRAL_SERVICE_HOST=${MISTRAL_SERVICE_HOST:-$SERVICE_HOST} MISTRAL_SERVICE_PORT=${MISTRAL_SERVICE_PORT:-8989}