summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCrae <andy.mccrae@gmail.com>2014-10-11 20:56:36 +0100
committerNikhil Komawar <nikhilskomawar@gmail.com>2014-10-14 12:48:49 -0400
commit9b176a278116849c8f7b7f4d9a987f37ec52779c (patch)
tree1f523a82abeed9c787ddc8b4cc9f275cc1d3896a
parent08f83f543bc992ae8f2787fb405e58c33dadba73 (diff)
downloadglance-9b176a278116849c8f7b7f4d9a987f37ec52779c.tar.gz
Adjust authentication.rst doc to reference "identity_uri"
The "auth_port", "auth_host", and "auth_protocol" variables were deprecated in favour of a single "identity_uri" variable. * Adjust authentication.rst doc to reference "identity_uri" Change-Id: I48de53f21b8d767b276858ed274066015d765f0e Closes-Bug: #1361613
-rw-r--r--doc/source/authentication.rst11
1 files changed, 4 insertions, 7 deletions
diff --git a/doc/source/authentication.rst b/doc/source/authentication.rst
index 71f565206..f7082dd8f 100644
--- a/doc/source/authentication.rst
+++ b/doc/source/authentication.rst
@@ -50,9 +50,7 @@ an example for ``authtoken``::
[filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
- auth_host = 127.0.0.1
- auth_port = 35357
- auth_protocol = http
+ identity_uri = http://127.0.0.1:35357
admin_user = glance_admin
admin_tenant_name = service_admins
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
documentation on the ``auth_token`` middleware, but in short:
-* Those variables beginning with ``auth_`` point to the Keystone
- Admin service. This information is used by the middleware to actually
- query Keystone about the validity of the
- authentication tokens.
+* The ``identity_uri`` variable points to the Keystone Admin service.
+ This information is used by the middleware to actually query Keystone about
+ the validity of the authentication tokens.
* The admin auth credentials (``admin_user``, ``admin_tenant_name``,
``admin_password``) will be used to retrieve an admin token. That
token will be used to authorize user tokens behind the scenes.