Use auth_token from keystonemiddleware

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

Change-Id: I5f17a4ea4e81e3d10142cb92f80de8d03c94c8c6
Closes-Bug: #1342274

debian/control

@@ -21,7 +21,7 @@ Depends: ${python:Depends}, ${misc:Depends},
  python-falcon,
  python-iso8601,
  python-jsonschema,
- python-keystoneclient,
+ keystonemiddleware,
  python-kombu,
  python-pastedeploy,
  python-pysqlite2,

etc/barbican/barbican-api-paste.ini

@@ -38,7 +38,7 @@ paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMid
 paste.filter_factory = barbican.api.middleware.context:ContextMiddleware.factory
 
 [filter:keystone_authtoken] 
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 signing_dir = /tmp/barbican/cache
 auth_host = localhost
 #need ability to re-auth a token, thus admin url

requirements.txt

@@ -15,7 +15,7 @@ pbr>=0.6,!=0.7,<1.0
 pecan>=0.6.0
 pycrypto>=2.6
 pysqlite
-python-keystoneclient>=0.9.0
+keystonemiddleware>=1.0.0
 six>=1.7.0
 SQLAlchemy>=0.7.8,<=0.9.99
 stevedore>=0.12

rpmbuild/SPECS/barbican.spec

@@ -18,7 +18,7 @@ Requires(pre): shadow-utils
 #TODO(dmend): add python-cryptography once it's available
 Requires: python-alembic, python-babel, python-crypto
 Requires: python-eventlet, python-iso8601, python-jsonschema
-Requires: python-keystoneclient, python-kombu, python-netaddr
+Requires: keystonemiddleware, python-kombu, python-netaddr
 Requires: python-oslo-config, python-oslo-messaging
 Requires: python-paste, python-paste-deploy, python-pbr, python-pecan
 Requires: python-six, python-sqlalchemy, python-stevedore