From d1e7f7e1805350647b3c2b65e432836d38c397ff Mon Sep 17 00:00:00 2001 From: melissaml Date: Wed, 18 Apr 2018 19:23:15 +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: Icbc6b3dd809e1f302d3cac9731f4845bc4df9f62 --- doc/samples/proton.conf.sample | 2 +- doc/source/devref/gluon-auth.inc | 6 +++--- doc/source/installation/install_gluon.rst | 2 +- etc/proton/proton.conf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/samples/proton.conf.sample b/doc/samples/proton.conf.sample index c6d39b4..207a362 100644 --- a/doc/samples/proton.conf.sample +++ b/doc/samples/proton.conf.sample @@ -162,7 +162,7 @@ # *not* be the same endpoint the service user utilizes for validating tokens, # because normal end users may not be able to reach that endpoint. (string # value) -#auth_uri = +#www_authenticate_uri = # API version of the admin Identity API endpoint. (string value) #auth_version = diff --git a/doc/source/devref/gluon-auth.inc b/doc/source/devref/gluon-auth.inc index e0fe7c3..7458e88 100644 --- a/doc/source/devref/gluon-auth.inc +++ b/doc/source/devref/gluon-auth.inc @@ -228,7 +228,7 @@ to your keystone endpoint. auth_strategy = keystone [keystone_authtoken] - auth_uri = http://127.0.0.1:5000 + www_authenticate_uri = http://127.0.0.1:5000 project_domain_name = Default project_name = service user_domain_name = Default @@ -241,8 +241,8 @@ The default ``auth_strategy`` is ``noauth`` in Gluon. Please note that: -* ``auth_uri`` is the **external** or **public** URL that ends up in the - ``WWW-Authenticate: keystone-uri=`` header. It is the unversioned public endpoint, +* ``www_authenticate_uri`` is the **external** or **public** URL that ends up in the + ``WWW-Authenticate: keystone-uri=`` header. It is the unversioned public endpoint, which tells someone where they need to go to authenticate. * ``auth_url`` is the **internal** URL that the **auth plugin** is using. It is where the process will authenticate to before it authenticates tokens. diff --git a/doc/source/installation/install_gluon.rst b/doc/source/installation/install_gluon.rst index 78a6045..4f73dde 100644 --- a/doc/source/installation/install_gluon.rst +++ b/doc/source/installation/install_gluon.rst @@ -267,7 +267,7 @@ and enable RBAC in Gluon. Here is the summary of steps: auth_strategy = keystone [keystone_authtoken] - auth_uri = http://10.0.2.7:5000 + www_authenticate_uri = http://10.0.2.7:5000 project_domain_name = Default project_name = service user_domain_name = Default diff --git a/etc/proton/proton.conf b/etc/proton/proton.conf index 3ef6183..1ccee6d 100644 --- a/etc/proton/proton.conf +++ b/etc/proton/proton.conf @@ -15,7 +15,7 @@ auth_strategy = keystone [keystone_authtoken] # keystone identity, change 127.0.0.1 to keystone endpoint -auth_uri = http://127.0.0.1:5000 +www_authenticate_uri = http://127.0.0.1:5000 project_domain_name = Default