From 769d499670f2f3ec060ccf2f7710da91fed6a76a Mon Sep 17 00:00:00 2001 From: melissaml Date: Wed, 18 Apr 2018 19:01:03 +0800 Subject: [PATCH] Update auth_uri option to www_authenticate_uri 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: I19a55c7e849dd47edff4d37a87a860ecc7e9ad27 --- doc/source/admin/config-dns-int-ext-serv.rst | 4 ++-- doc/source/admin/config-routed-networks.rst | 2 +- doc/source/install/compute-install-obs.rst | 2 +- doc/source/install/compute-install-rdo.rst | 2 +- doc/source/install/compute-install-ubuntu.rst | 2 +- doc/source/install/controller-install-option1-obs.rst | 2 +- doc/source/install/controller-install-option1-rdo.rst | 2 +- doc/source/install/controller-install-option1-ubuntu.rst | 2 +- doc/source/install/controller-install-option2-obs.rst | 2 +- doc/source/install/controller-install-option2-rdo.rst | 2 +- doc/source/install/controller-install-option2-ubuntu.rst | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/source/admin/config-dns-int-ext-serv.rst b/doc/source/admin/config-dns-int-ext-serv.rst index f696933ee6a..b04defcc22d 100644 --- a/doc/source/admin/config-dns-int-ext-serv.rst +++ b/doc/source/admin/config-dns-int-ext-serv.rst @@ -66,7 +66,7 @@ Once this is done, the user has to take the following steps and restart are validated. * ``cafile``: Path to a valid Certificate Authority (CA) certificate. Optional, the system CAs are used as default. - * ``auth_uri``: the unversioned public endpoint of the Identity service. + * ``www_authenticate_uri``: the unversioned public endpoint of the Identity service. The following is an example: @@ -86,7 +86,7 @@ Once this is done, the user has to take the following steps and restart ipv6_ptr_zone_prefix_size = 116 ptr_zone_email = admin@example.org cafile = /etc/ssl/certs/my_ca_cert - auth_uri = http://192.0.2.240:5000 + www_authenticate_uri = http://192.0.2.240:5000 Once the ``neutron-server`` has been configured and restarted, users will have diff --git a/doc/source/admin/config-routed-networks.rst b/doc/source/admin/config-routed-networks.rst index 8b9f4f39a77..19eaf2c8022 100644 --- a/doc/source/admin/config-routed-networks.rst +++ b/doc/source/admin/config-routed-networks.rst @@ -169,7 +169,7 @@ Controller node .. code-block:: ini [placement] - auth_uri = http://192.0.2.72/identity + www_authenticate_uri = http://192.0.2.72/identity project_domain_name = Default project_name = service user_domain_name = Default diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst index 5ed39b3252b..1c907a52fc0 100644 --- a/doc/source/install/compute-install-obs.rst +++ b/doc/source/install/compute-install-obs.rst @@ -58,7 +58,7 @@ authentication mechanism, message queue, and plug-in. [keystone_authtoken] # ... - 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/install/compute-install-rdo.rst b/doc/source/install/compute-install-rdo.rst index 1e651ed55f4..85371514a67 100644 --- a/doc/source/install/compute-install-rdo.rst +++ b/doc/source/install/compute-install-rdo.rst @@ -61,7 +61,7 @@ authentication mechanism, message queue, and plug-in. [keystone_authtoken] # ... - 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/install/compute-install-ubuntu.rst b/doc/source/install/compute-install-ubuntu.rst index b5586735136..d277d5e41c5 100644 --- a/doc/source/install/compute-install-ubuntu.rst +++ b/doc/source/install/compute-install-ubuntu.rst @@ -57,7 +57,7 @@ authentication mechanism, message queue, and plug-in. [keystone_authtoken] # ... - 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/install/controller-install-option1-obs.rst b/doc/source/install/controller-install-option1-obs.rst index cc40f66ed75..14d7d6690f0 100644 --- a/doc/source/install/controller-install-option1-obs.rst +++ b/doc/source/install/controller-install-option1-obs.rst @@ -87,7 +87,7 @@ and plug-in. [keystone_authtoken] # ... - 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/install/controller-install-option1-rdo.rst b/doc/source/install/controller-install-option1-rdo.rst index dc423ed327c..1485f5ae5f1 100644 --- a/doc/source/install/controller-install-option1-rdo.rst +++ b/doc/source/install/controller-install-option1-rdo.rst @@ -85,7 +85,7 @@ and plug-in. [keystone_authtoken] # ... - 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/install/controller-install-option1-ubuntu.rst b/doc/source/install/controller-install-option1-ubuntu.rst index 5e372295bea..78a5b13087a 100644 --- a/doc/source/install/controller-install-option1-ubuntu.rst +++ b/doc/source/install/controller-install-option1-ubuntu.rst @@ -86,7 +86,7 @@ and plug-in. [keystone_authtoken] # ... - 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/install/controller-install-option2-obs.rst b/doc/source/install/controller-install-option2-obs.rst index 4bde1d9d0c8..ccb3014bbc9 100644 --- a/doc/source/install/controller-install-option2-obs.rst +++ b/doc/source/install/controller-install-option2-obs.rst @@ -86,7 +86,7 @@ Configure the server component [keystone_authtoken] # ... - 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/install/controller-install-option2-rdo.rst b/doc/source/install/controller-install-option2-rdo.rst index 3c6c17c75cc..7aed0e121cd 100644 --- a/doc/source/install/controller-install-option2-rdo.rst +++ b/doc/source/install/controller-install-option2-rdo.rst @@ -84,7 +84,7 @@ Configure the server component [keystone_authtoken] # ... - 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/install/controller-install-option2-ubuntu.rst b/doc/source/install/controller-install-option2-ubuntu.rst index c36f6782ce2..e49ae437e7b 100644 --- a/doc/source/install/controller-install-option2-ubuntu.rst +++ b/doc/source/install/controller-install-option2-ubuntu.rst @@ -85,7 +85,7 @@ Configure the server component [keystone_authtoken] # ... - auth_uri = http://controller:5000 + www_authenticate_uri = http://controller:5000 auth_url = http://controller:35357 memcached_servers = controller:11211 auth_type = password