Merge "Replace deprecated configure_auth_token_middleware"

This commit is contained in:
Zuul 2025-02-12 01:12:01 +00:00 committed by Gerrit Code Review
commit 314c9797d9
2 changed files with 1 additions and 2 deletions

View File

@ -143,7 +143,7 @@ function configure_cyborg_agent {
# API specific configuration.
function configure_cyborg_api {
iniset $CYBORG_CONF_FILE DEFAULT auth_strategy $CYBORG_AUTH_STRATEGY
configure_auth_token_middleware $CYBORG_CONF_FILE cyborg $CYBORG_AUTH_CACHE_DIR/api
configure_keystone_authtoken_middleware $CYBORG_CONF_FILE cyborg
iniset $CYBORG_CONF_FILE oslo_policy policy_file $CYBORG_POLICY_JSON
iniset $CYBORG_CONF_FILE conductor automated_clean $CYBORG_AUTOMATED_CLEAN_ENABLED

View File

@ -11,7 +11,6 @@ CYBORG_DEVSTACK_DIR=$CYBORG_DIR/devstack
CYBORG_DEVSTACK_FILES_DIR=$CYBORG_DEVSTACK_DIR/files
CYBORG_DATA_DIR=$DATA_DIR/cyborg
CYBORG_STATE_PATH=/var/lib/cyborg
CYBORG_AUTH_CACHE_DIR=${CYBORG_AUTH_CACHE_DIR:-/var/cache/cyborg}
CYBORG_CONF_DIR=${CYBORG_CONF_DIR:-/etc/cyborg}
CYBORG_CONF_FILE=$CYBORG_CONF_DIR/cyborg.conf
CYBORG_API_PASTE_INI=$CYBORG_CONF_DIR/api-paste.ini