diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-19 01:56:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-19 01:56:03 +0000 |
| commit | 260bd2601b231c86830daaedc72a979d77a14498 (patch) | |
| tree | ee79e3f0386abd46a2836c0c510ae20b461cbab9 | |
| parent | 6a428c4266092a5b1ed9baeafa88f9943acaaafc (diff) | |
| parent | 708b24aef11f8a78f5bbc7c17d3199f8f8fc74c5 (diff) | |
| download | swift-260bd2601b231c86830daaedc72a979d77a14498.tar.gz | |
Merge "Deprecate auth_uri option"
| -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 | ||||
| -rw-r--r-- | etc/keymaster.conf-sample | 2 | ||||
| -rw-r--r-- | etc/proxy-server.conf-sample | 2 |
5 files changed, 6 insertions, 6 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 diff --git a/etc/keymaster.conf-sample b/etc/keymaster.conf-sample index c3ace4f00..ffecc787c 100644 --- a/etc/keymaster.conf-sample +++ b/etc/keymaster.conf-sample @@ -52,7 +52,7 @@ # project_id = changeme # 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. # auth_endpoint = http://keystonehost/identity diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index 5e7135c34..6bdd27bef 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -361,7 +361,7 @@ user_test5_tester5 = testing5 service # # [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 # The following credentials must match the Keystone credentials for the Swift |