diff --git a/debian/control b/debian/control index 1bb6c1eb3..7b4b69c57 100644 --- a/debian/control +++ b/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, diff --git a/etc/barbican/barbican-api-paste.ini b/etc/barbican/barbican-api-paste.ini index 7fd571b5f..ec3b70f73 100644 --- a/etc/barbican/barbican-api-paste.ini +++ b/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 diff --git a/requirements.txt b/requirements.txt index 0c8a58a27..42111b156 100644 --- a/requirements.txt +++ b/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 diff --git a/rpmbuild/SPECS/barbican.spec b/rpmbuild/SPECS/barbican.spec index c9e660293..816590cdd 100644 --- a/rpmbuild/SPECS/barbican.spec +++ b/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