openstack
/
sahara
Code Issues Proposed changes

Merge "devstack: do not use configure_auth_token_middleware"

This commit is contained in:
Zuul 2019-07-25 15:57:49 +00:00 committed by Gerrit Code Review
parent 1475545a83 c7fc57b42a
commit 2287d92f2b
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
View File

@ -45,7 +45,6 @@ function create_sahara_accounts {
function cleanup_sahara {
# Cleanup auth cache dir
sudo rm -rf $SAHARA_AUTH_CACHE_DIR
if [ "$SAHARA_USE_MOD_WSGI" == "True" ]; then
sudo rm -f $(apache_site_config_for sahara-api)
fi
@ -85,12 +84,7 @@ function configure_sahara {
cp -p $SAHARA_DIR/etc/sahara/api-paste.ini $SAHARA_CONF_DIR
# Create auth cache dir
sudo install -d -o $STACK_USER -m 700 $SAHARA_AUTH_CACHE_DIR
rm -rf $SAHARA_AUTH_CACHE_DIR/*
configure_auth_token_middleware \
$SAHARA_CONF_FILE sahara $SAHARA_AUTH_CACHE_DIR
configure_keystone_authtoken_middleware $SAHARA_CONF_FILE sahara
# Set admin user parameters needed for trusts creation
iniset $SAHARA_CONF_FILE \

2
devstack/settings
View File

@ -44,8 +44,6 @@ SAHARA_SERVICE_PORT_INT=${SAHARA_SERVICE_PORT_INT:-18386}
SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
SAHARA_ENDPOINT_TYPE=${SAHARA_ENDPOINT_TYPE:-publicURL}
SAHARA_AUTH_CACHE_DIR=${SAHARA_AUTH_CACHE_DIR:-/var/cache/sahara}
SAHARA_ENABLED_PLUGINS=${SAHARA_ENABLED_PLUGINS:-\
vanilla,ambari,cdh,mapr,spark,storm,fake}
SAHARA_INSTALLED_PLUGINS=${SAHARA_INSTALLED_PLUGINS:-\