x
/
gluon
Code Issues Proposed changes

Merge "Update auth_uri option to www_authenticate_uri"

This commit is contained in:
Zuul 2018-12-07 19:15:37 +00:00 committed by Gerrit Code Review
parent 30c55cb81b d1e7f7e180
commit de6af9bbff
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/samples/proton.conf.sample
View File

@ -162,7 +162,7 @@
# *not* be the same endpoint the service user utilizes for validating tokens, # *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 # because normal end users may not be able to reach that endpoint. (string
# value) # value)
#auth_uri = <None> #www_authenticate_uri = <None>
# API version of the admin Identity API endpoint. (string value) # API version of the admin Identity API endpoint. (string value)
#auth_version = <None> #auth_version = <None>

6
doc/source/devref/gluon-auth.inc
View File

@ -228,7 +228,7 @@ to your keystone endpoint.
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://127.0.0.1:5000 www_authenticate_uri = http://127.0.0.1:5000
project_domain_name = Default project_domain_name = Default
project_name = service project_name = service
user_domain_name = Default user_domain_name = Default
@ -241,8 +241,8 @@ The default ``auth_strategy`` is ``noauth`` in Gluon.
Please note that: Please note that:
* ``auth_uri`` is the **external** or **public** URL that ends up in the * ``www_authenticate_uri`` is the **external** or **public** URL that ends up in the
``WWW-Authenticate: keystone-uri=<auth_uri>`` header. It is the unversioned public endpoint, ``WWW-Authenticate: keystone-uri=<www_authenticate_uri>`` header. It is the unversioned public endpoint,
which tells someone where they need to go to authenticate. which tells someone where they need to go to authenticate.
* ``auth_url`` is the **internal** URL that the **auth plugin** is using. It is * ``auth_url`` is the **internal** URL that the **auth plugin** is using. It is
where the process will authenticate to before it authenticates tokens. where the process will authenticate to before it authenticates tokens.

2
doc/source/installation/install_gluon.rst
View File

@ -267,7 +267,7 @@ and enable RBAC in Gluon. Here is the summary of steps:
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://10.0.2.7:5000 www_authenticate_uri = http://10.0.2.7:5000
project_domain_name = Default project_domain_name = Default
project_name = service project_name = service
user_domain_name = Default user_domain_name = Default

2
etc/proton/proton.conf
View File

@ -15,7 +15,7 @@ auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
# keystone identity, change 127.0.0.1 to keystone endpoint # 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 project_domain_name = Default