Merge "Replace deprecated configure_auth_token_middleware"
This commit is contained in:
commit
002a3fb841
@ -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.
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user