openstack
/
swift
Code Issues Proposed changes

Deprecate auth_uri option 

Option auth_uri from group keystone_authtoken is deprecated[1].
Use option www_authenticate_uri from group keystone_authtoken.

[1]https://review.openstack.org/#/c/508522/

Change-Id: I43bbc8b8c986e54a9a0829a0631d78d4077306f8
This commit is contained in:
wangqi 2018-04-18 02:06:40 +00:00
parent 85b5277119
commit 708b24aef1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manpages/proxy-server.conf.5
View File

@ -299,7 +299,7 @@ for other examples.
.PD 0 .PD 0
.RS 10 .RS 10
.IP "paste.filter_factory = keystonemiddleware.auth_token:filter_factory" .IP "paste.filter_factory = keystonemiddleware.auth_token:filter_factory"
.IP "auth_uri = http://keystonehost:5000" .IP "www_authenticate_uri = http://keystonehost:5000"
.IP "auth_url = http://keystonehost:35357" .IP "auth_url = http://keystonehost:35357"
.IP "auth_plugin = password" .IP "auth_plugin = password"
.IP "project_domain_id = default" .IP "project_domain_id = default"

2
doc/source/install/controller-include.txt
View File

@ -55,7 +55,7 @@ following actions:
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
... ...
auth_uri = http://controller:5000 www_authenticate_uri = http://controller:5000
auth_url = http://controller:35357 auth_url = http://controller:35357
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_type = password auth_type = password

4
doc/source/overview_auth.rst
View File

@ -138,7 +138,7 @@ add the configuration for the authtoken middleware::
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_uri = http://keystonehost:5000/ www_authenticate_uri = http://keystonehost:5000/
auth_url = http://keystonehost:35357/ auth_url = http://keystonehost:35357/
auth_plugin = password auth_plugin = password
project_domain_id = default project_domain_id = default
@ -153,7 +153,7 @@ add the configuration for the authtoken middleware::
The actual values for these variables will need to be set depending on The actual values for these variables will need to be set depending on
your situation, but in short: your situation, but in short:
* ``auth_uri`` should point to a Keystone service from which users may * ``www_authenticate_uri`` should point to a Keystone service from which users may
retrieve tokens. This value is used in the `WWW-Authenticate` header that retrieve tokens. This value is used in the `WWW-Authenticate` header that
auth_token sends with any denial response. auth_token sends with any denial response.
* ``auth_url`` points to the Keystone Admin service. This information is * ``auth_url`` points to the Keystone Admin service. This information is

2
etc/keymaster.conf-sample
View File

@ -52,7 +52,7 @@
# project_id = changeme # project_id = changeme
# The Keystone URL to authenticate to. The value of auth_endpoint may be # The Keystone URL to authenticate to. The value of auth_endpoint may be
# set according to the value of auth_uri in [filter:authtoken] in # set according to the value of www_authenticate_uri in [filter:authtoken] in
# proxy-server.conf. # proxy-server.conf.
# auth_endpoint = http://keystonehost/identity # auth_endpoint = http://keystonehost/identity

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

@ -361,7 +361,7 @@ user_test5_tester5 = testing5 service
# #
# [filter:authtoken] # [filter:authtoken]
# paste.filter_factory = keystonemiddleware.auth_token:filter_factory # paste.filter_factory = keystonemiddleware.auth_token:filter_factory
# auth_uri = http://keystonehost:5000 # www_authenticate_uri = http://keystonehost:5000
# auth_url = http://keystonehost:35357 # auth_url = http://keystonehost:35357
# auth_plugin = password # auth_plugin = password
# The following credentials must match the Keystone credentials for the Swift # The following credentials must match the Keystone credentials for the Swift