From 1272bc5e93f171c8d7193475547c43b9032b5c39 Mon Sep 17 00:00:00 2001 From: Nikhil Manchanda Date: Fri, 31 Jan 2014 15:04:05 -0800 Subject: [PATCH] Pipeline filter is 'authtoken' and not 'tokenauth' The pipeline fileter in the api-paste.ini for the keystone middleware was renamed to 'authtoken'. Trove install is not able to authenticate against keystone unless this is renamed Change-Id: I6f912d29c143b3acbc43da222cf8b4c3fafb2c8d --- lib/trove | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/trove b/lib/trove index 1fd011a530..2000446b13 100644 --- a/lib/trove +++ b/lib/trove @@ -129,14 +129,14 @@ function configure_trove() { # Copy api-paste file over to the trove conf dir and configure it cp $TROVE_LOCAL_CONF_DIR/api-paste.ini $TROVE_CONF_DIR/api-paste.ini TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini - iniset $TROVE_API_PASTE_INI filter:tokenauth auth_host $KEYSTONE_AUTH_HOST - iniset $TROVE_API_PASTE_INI filter:tokenauth auth_port $KEYSTONE_AUTH_PORT - iniset $TROVE_API_PASTE_INI filter:tokenauth auth_protocol $KEYSTONE_AUTH_PROTOCOL - iniset $TROVE_API_PASTE_INI filter:tokenauth cafile $KEYSTONE_SSL_CA - iniset $TROVE_API_PASTE_INI filter:tokenauth admin_tenant_name $SERVICE_TENANT_NAME - iniset $TROVE_API_PASTE_INI filter:tokenauth admin_user trove - iniset $TROVE_API_PASTE_INI filter:tokenauth admin_password $SERVICE_PASSWORD - iniset $TROVE_API_PASTE_INI filter:tokenauth signing_dir $TROVE_AUTH_CACHE_DIR + iniset $TROVE_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST + iniset $TROVE_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT + iniset $TROVE_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL + iniset $TROVE_API_PASTE_INI filter:authtoken cafile $KEYSTONE_SSL_CA + iniset $TROVE_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME + iniset $TROVE_API_PASTE_INI filter:authtoken admin_user trove + iniset $TROVE_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD + iniset $TROVE_API_PASTE_INI filter:authtoken signing_dir $TROVE_AUTH_CACHE_DIR # (Re)create trove conf files rm -f $TROVE_CONF_DIR/trove.conf