Merge "Adjust authentication.rst doc to reference "identity_uri""

This commit is contained in:
Jenkins 2014-10-14 22:08:38 +00:00 committed by Gerrit Code Review
commit 46a6f0e20a

View File

@ -50,9 +50,7 @@ an example for ``authtoken``::
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_host = 127.0.0.1 identity_uri = http://127.0.0.1:35357
auth_port = 35357
auth_protocol = http
admin_user = glance_admin admin_user = glance_admin
admin_tenant_name = service_admins admin_tenant_name = service_admins
admin_password = password1234 admin_password = password1234
@ -61,10 +59,9 @@ The actual values for these variables will need to be set depending on
your situation. For more information, please refer to the Keystone your situation. For more information, please refer to the Keystone
documentation on the ``auth_token`` middleware, but in short: documentation on the ``auth_token`` middleware, but in short:
* Those variables beginning with ``auth_`` point to the Keystone * The ``identity_uri`` variable points to the Keystone Admin service.
Admin service. This information is used by the middleware to actually This information is used by the middleware to actually query Keystone about
query Keystone about the validity of the the validity of the authentication tokens.
authentication tokens.
* The admin auth credentials (``admin_user``, ``admin_tenant_name``, * The admin auth credentials (``admin_user``, ``admin_tenant_name``,
``admin_password``) will be used to retrieve an admin token. That ``admin_password``) will be used to retrieve an admin token. That
token will be used to authorize user tokens behind the scenes. token will be used to authorize user tokens behind the scenes.