openstack/vitrage
Code Issues Proposed changes

Merge "Replace deprecated configure_auth_token_middleware"

Browse Source
This commit is contained in:
Zuul 2024-11-16 19:13:58 +00:00 committed by Gerrit Code Review
commit 002a3fb841
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -224,7 +224,7 @@ function configure_vitrage {
# copy datasources # copy datasources
cp $VITRAGE_DIR/etc/vitrage/datasources_values/*.yaml $VITRAGE_CONF_DIR/datasources_values 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" password $ADMIN_PASSWORD
iniset $VITRAGE_CONF "keystone_authtoken" user_domain_name $admin_domain_name iniset $VITRAGE_CONF "keystone_authtoken" user_domain_name $admin_domain_name
@ -258,10 +258,6 @@ function init_vitrage {
$VITRAGE_BIN_DIR/vitrage-dbsync $VITRAGE_BIN_DIR/vitrage-dbsync
fi fi
fi fi
# Create cache dir
sudo install -d -o $STACK_USER $VITRAGE_AUTH_CACHE_DIR
rm -f $VITRAGE_AUTH_CACHE_DIR/*
} }
# Install Vitrage. # Install Vitrage.

1
devstack/settings
View File

@ -16,7 +16,6 @@ enable_service vitrage-snmp-parsing
VITRAGE_DIR=$DEST/vitrage VITRAGE_DIR=$DEST/vitrage
VITRAGE_CONF_DIR=/etc/vitrage VITRAGE_CONF_DIR=/etc/vitrage
VITRAGE_CONF=$VITRAGE_CONF_DIR/vitrage.conf 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_WSGI_DIR=${VITRAGE_WSGI_DIR:-/var/www/vitrage}
VITRAGE_UWSGI_FILE=$VITRAGE_CONF_DIR/vitrage-uwsgi.ini VITRAGE_UWSGI_FILE=$VITRAGE_CONF_DIR/vitrage-uwsgi.ini
VITRAGE_PUBLIC_UWSGI=$VITRAGE_DIR/vitrage/api/app.wsgi VITRAGE_PUBLIC_UWSGI=$VITRAGE_DIR/vitrage/api/app.wsgi