openstack/swift
Code Issues Proposed changes

Use auth_token from keystonemiddleware

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

Change-Id: Ia04aa83348e0776cb3239cb5420ee1450a990d5b
Closes-Bug: #1342274
This commit is contained in:
guang-yee 2014-07-23 10:27:40 -07:00 committed by Samuel Merritt
parent 3e78432cb1
commit ee14d58d84
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/overview_auth.rst
View File

@ -113,11 +113,11 @@ Swift is able to authenticate against OpenStack keystone via the
:mod:`swift.common.middleware.keystoneauth` middleware. :mod:`swift.common.middleware.keystoneauth` middleware.
In order to use the ``keystoneauth`` middleware the ``authtoken`` In order to use the ``keystoneauth`` middleware the ``authtoken``
middleware from python-keystoneclient will need to be configured. middleware from keystonemiddleware will need to be configured.
The ``authtoken`` middleware performs the authentication token The ``authtoken`` middleware performs the authentication token
validation and retrieves actual user authentication information. It validation and retrieves actual user authentication information. It
can be found in the python-keystoneclient distribution. can be found in the keystonemiddleware distribution.
The ``keystoneauth`` middleware performs authorization and mapping the The ``keystoneauth`` middleware performs authorization and mapping the
``keystone`` roles to Swift's ACLs. ``keystone`` roles to Swift's ACLs.
@ -149,7 +149,7 @@ and add auth_token and keystoneauth in your
add the configuration for the authtoken middleware:: add the configuration for the authtoken middleware::
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_host = keystonehost auth_host = keystonehost
auth_port = 35357 auth_port = 35357
auth_protocol = http auth_protocol = http

2
etc/proxy-server.conf-sample
View File

@ -266,7 +266,7 @@ user_test_tester3 = testing3
# there you can change it to: authtoken keystoneauth # there you can change it to: authtoken keystoneauth
# #
# [filter:authtoken] # [filter:authtoken]
# paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory # paste.filter_factory = keystonemiddleware.auth_token:filter_factory
# auth_host = keystonehost # auth_host = keystonehost
# auth_port = 35357 # auth_port = 35357
# auth_protocol = http # auth_protocol = http