Use auth_token middleware from keystoneclient.

auth_token middleware has been move from keystone to python-keystonecient,
so add python-keystoneclient dependence instead of keystone.Also adds
missing signing_dir option.

Change-Id: I24a4f422c35b721338c7519212c21ed2fbc255b3

diff --git a/etc/cinder/api-paste.ini b/etc/cinder/api-paste.ini
index a7255ab868c510a4e86619bba25f0dc9e63ac3b4..f4c433f258639defa78bd40d42f98b16331b8fd4 100644 (file)
--- a/etc/cinder/api-paste.ini
+++ b/etc/cinder/api-paste.ini
@@ -49,7 +49,7 @@ paste.app_factory = cinder.api.versions:Versions.factory
 paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 service_protocol = http
 service_host = 127.0.0.1
 service_port = 5000
@@ -59,3 +59,4 @@ auth_protocol = http
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%
+signing_dir = /var/lib/cinder

diff --git a/tools/pip-requires b/tools/pip-requires
index 1a460b5b88a016deca3dc9d5e45096e0cc0d21e7..8aaa8613bb1bf7017a78207f064774de5cd2a941 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -18,3 +18,4 @@ Babel>=0.9.6
 iso8601>=0.1.4
 setuptools_git>=0.4
 python-glanceclient>=0.5.0,<2
+python-keystoneclient>=0.2.0