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
| ... | ... |
@@ -123,11 +123,8 @@ function configure_trove {
|
| 123 | 123 |
sudo chown -R $STACK_USER: ${TROVE_CONF_DIR}
|
| 124 | 124 |
sudo chown -R $STACK_USER: ${TROVE_AUTH_CACHE_DIR}
|
| 125 | 125 |
|
| 126 |
- # Copy api-paste file over to the trove conf dir and configure it |
|
| 126 |
+ # Copy api-paste file over to the trove conf dir |
|
| 127 | 127 |
cp $TROVE_LOCAL_CONF_DIR/api-paste.ini $TROVE_CONF_DIR/api-paste.ini |
| 128 |
- TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini |
|
| 129 |
- |
|
| 130 |
- configure_auth_token_middleware $TROVE_API_PASTE_INI trove $TROVE_AUTH_CACHE_DIR filter:authtoken |
|
| 131 | 128 |
|
| 132 | 129 |
# (Re)create trove conf files |
| 133 | 130 |
rm -f $TROVE_CONF_DIR/trove.conf |
| ... | ... |
@@ -141,6 +138,7 @@ function configure_trove {
|
| 141 | 141 |
setup_trove_logging $TROVE_CONF_DIR/trove.conf |
| 142 | 142 |
iniset $TROVE_CONF_DIR/trove.conf DEFAULT trove_api_workers "$API_WORKERS" |
| 143 | 143 |
|
| 144 |
+ configure_auth_token_middleware $TROVE_CONF_DIR/trove.conf trove $TROVE_AUTH_CACHE_DIR |
|
| 144 | 145 |
|
| 145 | 146 |
# (Re)create trove taskmanager conf file if needed |
| 146 | 147 |
if is_service_enabled tr-tmgr; then |