openstack/glance
Code Issues Proposed changes

Use auth_token from keystonemiddleware

Browse Source 
The auth_token middleware in python-keystoneclient is now
deprecated and has been moved to keystonemiddleware.

Closes-Bug: #1342274

Change-Id: Ic8ba2d2f470ec052ba13c3b63b26d5e2270f7412
This commit is contained in:
Brant Knudson 2014-06-24 16:07:36 -05:00
parent 7ce446009e
commit adeca09124
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/authentication.rst
View File

@ -49,7 +49,7 @@ pieces of middleware exist in the ``glance-api-paste.ini``. Here is
an example for ``authtoken``::
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http

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

@ -65,7 +65,7 @@ paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
delay_auth_decision = true
[filter:gzip]

2
etc/glance-registry-paste.ini
View File

@ -22,4 +22,4 @@ paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
paste.filter_factory = keystonemiddleware.auth_token:filter_factory

2
glance/registry/client/v1/api.py
View File

@ -33,7 +33,7 @@ registry_client_ctx_opts = [
help=_("Whether to pass through headers containing user "
"and tenant information when making requests to "
"the registry. This allows the registry to use the "
"context middleware without the keystoneclients' "
"context middleware without keystonemiddleware's "
"auth_token middleware, removing calls to the keystone "
"auth service. It is recommended that when using this "
"option, secure communication between glance api and "

1
requirements.txt
View File

@ -23,6 +23,7 @@ ordereddict
oslo.config>=1.2.1
stevedore>=0.14
netaddr>=0.7.6
keystonemiddleware
# For openstack/common/lockutils
posix_ipc