Trove configure authtoken via conf file
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
diff --git a/lib/trove b/lib/trove
index d889b05..abf4e87 100644
--- a/lib/trove
+++ b/lib/trove
@@ -123,11 +123,8 @@
sudo chown -R $STACK_USER: ${TROVE_CONF_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
- 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
rm -f $TROVE_CONF_DIR/trove.conf
@@ -141,6 +138,7 @@
setup_trove_logging $TROVE_CONF_DIR/trove.conf
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
if is_service_enabled tr-tmgr; then