From c3d28d52bb009adb76efa392c78813b51f87aa52 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Mon, 21 Sep 2015 15:04:35 -0400 Subject: [PATCH] Update the examples used for the trusted_dashboard option The code to check for a trusted dashboard host explicitly checks for the path /auth/websso in addition to the hostname. The documentations references this: http://docs.openstack.org/developer/keystone/federation/websso.html But we should update the examples used in the sample config. Change-Id: I595395dc780b3f54d396787678e9d24e5441ab1a --- keystone/common/config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keystone/common/config.py b/keystone/common/config.py index a09aca513e..107fbbf555 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -529,8 +529,9 @@ FILE_OPTIONS = { 'token, the origin host must be a member of the ' 'trusted_dashboard list. This configuration ' 'option may be repeated for multiple values. ' - 'For example: trusted_dashboard=http://acme.com ' - 'trusted_dashboard=http://beta.com'), + 'For example: ' + 'trusted_dashboard=http://acme.com/auth/websso ' + 'trusted_dashboard=http://beta.com/auth/websso'), cfg.StrOpt('sso_callback_template', default=_SSO_CALLBACK, help='Location of Single Sign-On callback handler, will ' 'return a token to a trusted dashboard host.'),