openstack/devstack
Code Issues Proposed changes

Trove configure authtoken via conf file

Browse Source 
Configure auth_token middleware in trove via the conf file rather than
the paste pipeline. This is the standard and expected mechanism.

Change-Id: Iec6bf74c9321082c35465d332aba7f5fa240cc1a
This commit is contained in:
Jamie Lennox 2014-12-23 11:08:15 +10:00
parent 27f0339f86
commit 2de47465bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/trove
View File

@ -123,11 +123,8 @@ function configure_trove {
sudo chown -R $STACK_USER: ${TROVE_CONF_DIR} sudo chown -R $STACK_USER: ${TROVE_CONF_DIR}
sudo chown -R $STACK_USER: ${TROVE_AUTH_CACHE_DIR} sudo chown -R $STACK_USER: ${TROVE_AUTH_CACHE_DIR}
# Copy api-paste file over to the trove conf dir and configure it # Copy api-paste file over to the trove conf dir
cp $TROVE_LOCAL_CONF_DIR/api-paste.ini $TROVE_CONF_DIR/api-paste.ini cp $TROVE_LOCAL_CONF_DIR/api-paste.ini $TROVE_CONF_DIR/api-paste.ini
TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini
configure_auth_token_middleware $TROVE_API_PASTE_INI trove $TROVE_AUTH_CACHE_DIR filter:authtoken
# (Re)create trove conf files # (Re)create trove conf files
rm -f $TROVE_CONF_DIR/trove.conf rm -f $TROVE_CONF_DIR/trove.conf
@ -141,6 +138,7 @@ function configure_trove {
setup_trove_logging $TROVE_CONF_DIR/trove.conf setup_trove_logging $TROVE_CONF_DIR/trove.conf
iniset $TROVE_CONF_DIR/trove.conf DEFAULT trove_api_workers "$API_WORKERS" iniset $TROVE_CONF_DIR/trove.conf DEFAULT trove_api_workers "$API_WORKERS"
configure_auth_token_middleware $TROVE_CONF_DIR/trove.conf trove $TROVE_AUTH_CACHE_DIR
# (Re)create trove taskmanager conf file if needed # (Re)create trove taskmanager conf file if needed
if is_service_enabled tr-tmgr; then if is_service_enabled tr-tmgr; then