Use auth_token from keystonemiddleware

auth_token middleware in python-keystoneclient is deprecated and has
been moved to the keystonemiddleware repo.

Closes-Bug: #1342274

Change-Id: I1aadbe24db63eb2507b088cd53886d7f2e192cab

diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index be8aae17fc7e467fc646eadd41b7d27a7bd333fc..bbcd41527df396749f7ce906b0de64c8d91fc9da 100644 (file)
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -18,7 +18,7 @@ paste.filter_factory = neutron.openstack.common.middleware.catch_errors:CatchErr
 paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory
 
 [filter:authtoken]
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 
 [filter:extensions]
 paste.filter_factory = neutron.api.extensions:plugin_aware_extension_middleware_factory

diff --git a/requirements.txt b/requirements.txt
index 24f7c2c9bfb213d3489a758346425ea5de032a29..30792407eccddaa42d23eb6925f27bbb5e3a867a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,7 @@ requests>=1.1
 iso8601>=0.1.9
 jsonrpclib
 Jinja2
+keystonemiddleware
 kombu>=2.4.8
 netaddr>=0.7.6
 python-neutronclient>=2.3.4,<3