Use auth_token middleware in keystoneclient.

The auth_token middleware moved into keystoneclient so a full
keystone install is not required to use the middleware.Also
add missing signing_dir to api-paste.ini.

Change-Id: If6c339045b70b3d4d70f0297ec32ed3cfdf431de

diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index d697876a524a34e7c66a98706bc3f9ebf4c6abc1..c4c13ede2a626983f86da539ec1a62404042e1ab 100644 (file)
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -12,13 +12,14 @@ keystone = authtoken keystonecontext extensions quantumapiapp_v2_0
 paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%
+signing_dir = /var/lib/quantum
 
 [filter:extensions]
 paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory

diff --git a/tools/pip-requires b/tools/pip-requires
index c3979481bd7949ed85ff37ab012fe042f99b8a59..4ba023f3282f7e6c0ca5c9cae4c98b0b9ca3c927 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -13,3 +13,4 @@ python-quantumclient>=2.0
 pyudev
 sqlalchemy==0.7.9
 webob==1.0.8
+python-keystoneclient>=0.2.0