openstack/swift
Code Issues Proposed changes

s3token: Add note about config change when upgrading from swift3

Browse Source 
Change-Id: I2610cbdc9b7bc2b4d614eaedb4f3369d7a424ab3
This commit is contained in:
Tim Burke 2019-03-05 14:50:22 -08:00
parent 703249d6cb
commit d748851766
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,7 +589,8 @@ reseller_prefix = AUTH_
# useful if there are multiple auth systems in the proxy pipeline.
delay_auth_decision = False
# Keystone server details
# Keystone server details. Note that this differs from how swift3 was
# configured: in particular, the Keystone API version must be included.
auth_uri = http://keystonehost:35357/v3
# Connect/read timeout to use when communicating with Keystone

19
swift/common/middleware/s3api/s3token.py
View File

@ -33,6 +33,25 @@ This middleware:
* Optionally can retrieve and cache secret from keystone
to validate signature locally
.. note::
If upgrading from swift3, the ``auth_version`` config option has been
removed, and the ``auth_uri`` option now includes the Keystone API
version. If you previously had a configuration like
.. code-block:: ini
[filter:s3token]
use = egg:swift3#s3token
auth_uri = https://keystonehost:35357
auth_version = 3
you should now use
.. code-block:: ini
[filter:s3token]
use = egg:swift#s3token
auth_uri = https://keystonehost:35357/v3
"""
import base64