From 49fe1184edcc23444b41166d4fdde1914f14b84e Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Fri, 11 May 2018 08:57:51 +0700 Subject: [PATCH] Replace deprecated "auth_uri" by "www_authenticate_uri" According to [1], "auth_uri" has been deprecated. This patch replace it by using "www_authenticate_uri" instead. [1] https://review.openstack.org/#/c/508522 Change-Id: Ie87e1d4a202f30265c3a46037e20db9082292ca2 --- doc/source/install/installation-manual.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/install/installation-manual.rst b/doc/source/install/installation-manual.rst index f37da3cd..41cc8c42 100644 --- a/doc/source/install/installation-manual.rst +++ b/doc/source/install/installation-manual.rst @@ -72,7 +72,7 @@ Installation with Central Neutron Server [keystone_authtoken] user_domain_name, "user domain name of service account, needed for password authentication", Default [keystone_authtoken] project_name, "project name of service account, needed for password authentication", service [keystone_authtoken] project_domain_name, "project domain name of service account, needed for password authentication", Default - [keystone_authtoken] auth_uri, "complete public Identity API endpoint", http://$keystone_service_host/identity + [keystone_authtoken] www_authenticate_uri, "complete public Identity API endpoint", http://$keystone_service_host/identity [keystone_authtoken] cafile, "A PEM encoded Certificate Authority to use when verifying HTTPs", /opt/stack/data/ca-bundle.pem [keystone_authtoken] signing_dir, "Directory used to cache files related to PKI tokens", /var/cache/tricircle [keystone_authtoken] memcached_servers, "Optionally specify a list of memcached server(s) to use for caching", $keystone_service_host:11211 @@ -92,10 +92,10 @@ Installation with Central Neutron Server keystone_service_host to the address of Keystone service. .. note:: It's worth explaining the following options that can easily make users confused. **keystone_authtoken.auth_url** - is the keystone endpoint url used by services to validate user tokens. **keystone_authtoken.auth_uri** will be put in + is the keystone endpoint url used by services to validate user tokens. **keystone_authtoken.www_authenticate_uri** will be put in the "WWW-Authenticate: Keystone uri=%s" header in the 401 response to tell users where they can get authentication. These two URLs can be the same, but sometimes people would like to use an internal URL for auth_url and a public URL - for auth_uri. **client.auth_url** is used by the common.client module to construct a client to get authentication and + for www_authenticate_uri. **client.auth_url** is used by the common.client module to construct a client to get authentication and access other services, it can be the either internal or public endpoint of keystone, depends on how the module can reach keystone. **client.identity_url** is no longer used in code since Pike release so you can simply ignore it, we will deprecate and remove this option later.