From 1917e2ff0702f1d691b94d55058ac2e85bf0ce5a Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Tue, 24 Jun 2014 16:32:54 -0500 Subject: [PATCH] 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 --- etc/cinder/api-paste.ini | 2 +- etc/cinder/cinder.conf.sample | 2 +- requirements.txt | 2 +- tools/config/oslo.config.generator.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/cinder/api-paste.ini b/etc/cinder/api-paste.ini index 6829edbf6..ff7f11975 100644 --- a/etc/cinder/api-paste.ini +++ b/etc/cinder/api-paste.ini @@ -52,4 +52,4 @@ paste.app_factory = cinder.api.versions:Versions.factory paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory [filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index 848af4c64..592bb5163 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -2135,7 +2135,7 @@ [keystone_authtoken] # -# Options defined in keystoneclient.middleware.auth_token +# Options defined in keystonemiddleware.auth_token # # Prefix to prepend at the beginning of the path. Deprecated, diff --git a/requirements.txt b/requirements.txt index 958608863..d85f822c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ Babel>=1.3 eventlet>=0.13.0 greenlet>=0.3.2 iso8601>=0.1.9 +keystonemiddleware>=1.0.0 kombu>=2.4.8 lxml>=2.3 netaddr>=0.7.6 @@ -17,7 +18,6 @@ Paste PasteDeploy>=1.5.0 pycrypto>=2.6 python-glanceclient>=0.13.1 -python-keystoneclient>=0.9.0 python-novaclient>=2.17.0 python-swiftclient>=2.0.2 requests>=1.1 diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc index 540e58471..d17957ef4 100644 --- a/tools/config/oslo.config.generator.rc +++ b/tools/config/oslo.config.generator.rc @@ -1,2 +1,2 @@ -export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token" +export CINDER_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token" export CINDER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo.db oslo.db.concurrency" -- 2.45.2