From 698b00d0ba3e952ffe42a7088ef9d4676db0d262 Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Fri, 4 Sep 2015 22:49:27 +0800 Subject: [PATCH] Configuration is outdated Part of configuration options have been deprecated, the doc need sync with this change, this patch also add the configuration option `identity_uri` and `auth_url` in the example. Change-Id: I1994d899c4dae47412983781647ed5865bdaf6eb Closes-Bug: #1422432 --- doc/source/middlewarearchitecture.rst | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst index d5fd9cf8..fa59e663 100644 --- a/doc/source/middlewarearchitecture.rst +++ b/doc/source/middlewarearchitecture.rst @@ -126,18 +126,31 @@ a WSGI component. Example for the auth_token middleware: # Prefix to prepend at the beginning of the path (string # value) + # Deprecated group/name - [keystone_authtoken]/auth_url #auth_admin_prefix= + # Authentication URL (string value) + auth_url=http://127.0.0.1:35357 + # Host providing the admin Identity API endpoint (string # value) - auth_host=127.0.0.1 + # Deprecated group/name - [keystone_authtoken]/auth_url + #auth_host=127.0.0.1 # Port of the admin Identity API endpoint (integer value) - auth_port=35357 + # Deprecated group/name - [keystone_authtoken]/auth_url + #auth_port=35357 # Protocol of the admin Identity API endpoint(http or https) # (string value) - auth_protocol=https + # Deprecated group/name - [keystone_authtoken]/auth_url + #auth_protocol=https + + # Complete admin Identity API endpoint. + # This should specify the unversioned root endpoint + # e.g. https://localhost:35357/. (string value) + # Deprecated group/name - [keystone_authtoken]/auth_url + #identity_uri= # Complete public Identity API endpoint (string value) #auth_uri= @@ -162,6 +175,7 @@ a WSGI component. Example for the auth_token middleware: # Single shared secret with the Keystone configuration used # for bootstrapping a Keystone installation, or otherwise # bypassing the normal authentication process. (string value) + # Deprecated, use username and password instead. #admin_token= # Keystone account username (string value)