Merge "Update auth_uri option to www_authenticate_uri"

2018-04-18 14:48:59 +00:00
parent 26b744740e 769d499670
commit 390cc07c8c
11 changed files with 12 additions and 12 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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