openstack
/
cinder
Code Issues Proposed changes

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
This commit is contained in:
Brant Knudson 2014-06-24 16:32:54 -05:00 committed by Jamie Lennox
parent 07534bef77
commit 1917e2ff07
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/cinder/api-paste.ini
View File

@ -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

2
etc/cinder/cinder.conf.sample
View File

@ -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,

2
requirements.txt
View File

@ -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

2
tools/config/oslo.config.generator.rc
View File

@ -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"