From 3ea34d29ad837e921d27fa209a3eb14c61c7daa6 Mon Sep 17 00:00:00 2001 From: chioleong Date: Tue, 22 Jul 2014 12:23:47 -0700 Subject: [PATCH] Use auth_token from keystonemiddleware auth_token middleware in python-keystoneclient is deprecated and has been moved to the keystonemiddleware repo. Change-Id: Id5056c834fb99f93c507a867ff6d8c085d7394f9 Closes-Bug: #1342274 --- designate/__init__.py | 2 +- etc/designate/api-paste.ini | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designate/__init__.py b/designate/__init__.py index a18b8b83..5be5b395 100644 --- a/designate/__init__.py +++ b/designate/__init__.py @@ -60,7 +60,7 @@ cfg.CONF.set_default('default_log_levels', 'keystone=INFO', 'eventlet.wsgi.server=WARN', 'stevedore=WARN', - 'keystoneclient.middleware.auth_token=INFO']) + 'keystonemiddleware.auth_token=INFO']) # Set some Oslo RPC defaults messaging.set_transport_defaults('designate') diff --git a/etc/designate/api-paste.ini b/etc/designate/api-paste.ini index c6905c5e..6fd5a7b8 100644 --- a/etc/designate/api-paste.ini +++ b/etc/designate/api-paste.ini @@ -30,7 +30,7 @@ paste.filter_factory = designate.openstack.common.middleware.request_id:RequestI paste.filter_factory = designate.api.middleware:NoAuthContextMiddleware.factory [filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory [filter:keystonecontext] paste.filter_factory = designate.api.middleware:KeystoneContextMiddleware.factory diff --git a/requirements.txt b/requirements.txt index 77c8627d..ff7ef5d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ extras Flask>=0.10,<1.0 iso8601>=0.1.9 jsonschema>=2.0.0,<3.0.0 +keystonemiddleware>=1.0.0 kombu>=2.4.8 lockfile>=0.8 netaddr>=0.7.6 @@ -14,7 +15,6 @@ Paste PasteDeploy>=1.5.0 pbr>=0.6,!=0.7,<1.0 pecan>=0.5.0 -python-keystoneclient>=0.9.0 python-neutronclient>=2.3.5,<3 Routes>=1.12.3,!=2.0 six>=1.7.0