diff options
| author | wangqi <wang.qi@99cloud.net> | 2018-04-18 02:06:40 +0000 |
|---|---|---|
| committer | Vu Cong Tuan <tuanvc@vn.fujitsu.com> | 2018-05-15 06:52:14 +0000 |
| commit | 1c3f03687566dc3ee82406f0f66dc9ada81ea574 (patch) | |
| tree | 4186262e1f756adafe0658b143925a4e5fdada96 /doc | |
| parent | caeeb5412359d24b69013639a34272009cea5c63 (diff) | |
| download | swift-1c3f03687566dc3ee82406f0f66dc9ada81ea574.tar.gz | |
Deprecate auth_uri option
Option auth_uri from group keystone_authtoken is deprecated in Queens [1].
Use option www_authenticate_uri from group keystone_authtoken.
[1]https://review.openstack.org/#/c/508522/
Change-Id: I43bbc8b8c986e54a9a0829a0631d78d4077306f8
(cherry picked from commit 708b24aef11f8a78f5bbc7c17d3199f8f8fc74c5)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manpages/proxy-server.conf.5 | 2 | ||||
| -rw-r--r-- | doc/source/install/controller-include.txt | 2 | ||||
| -rw-r--r-- | doc/source/overview_auth.rst | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5 index 5f0c78662..f77a8118e 100644 --- a/doc/manpages/proxy-server.conf.5 +++ b/doc/manpages/proxy-server.conf.5 @@ -299,7 +299,7 @@ for other examples. .PD 0 .RS 10 .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_plugin = password" .IP "project_domain_id = default" diff --git a/doc/source/install/controller-include.txt b/doc/source/install/controller-include.txt index cf9e9d173..779b2fa7e 100644 --- a/doc/source/install/controller-include.txt +++ b/doc/source/install/controller-include.txt @@ -55,7 +55,7 @@ following actions: [filter:authtoken] paste.filter_factory = keystonemiddleware.auth_token:filter_factory ... - auth_uri = http://controller:5000 + www_authenticate_uri = http://controller:5000 auth_url = http://controller:35357 memcached_servers = controller:11211 auth_type = password diff --git a/doc/source/overview_auth.rst b/doc/source/overview_auth.rst index ab87bea88..ac0005ec2 100644 --- a/doc/source/overview_auth.rst +++ b/doc/source/overview_auth.rst @@ -138,7 +138,7 @@ add the configuration for the authtoken middleware:: [filter:authtoken] 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_plugin = password 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 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 auth_token sends with any denial response. * ``auth_url`` points to the Keystone Admin service. This information is |