From de289a666fd9f03725ade1f6ffb5ad3904295a94 Mon Sep 17 00:00:00 2001 From: Yaguang Tang Date: Tue, 27 Nov 2012 17:06:25 +0800 Subject: [PATCH] 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 --- etc/cinder/api-paste.ini | 3 ++- tools/pip-requires | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/cinder/api-paste.ini b/etc/cinder/api-paste.ini index a7255ab86..f4c433f25 100644 --- 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 1a460b5b8..8aaa8613b 100644 --- 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 -- 2.45.2