summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-22 18:19:23 +0000
committerGerrit Code Review <review@openstack.org>2015-09-22 18:19:23 +0000
commit484f12da7e29e0905708b17bd2344a11a6f1e7c2 (patch)
tree5a59acbd71f1f65d0289c4b0b4bcfe22f55fc37f
parent83e6a2d8e3334b55cb315f5a69d64d3b01c010af (diff)
parentc3d28d52bb009adb76efa392c78813b51f87aa52 (diff)
downloadkeystone-484f12da7e29e0905708b17bd2344a11a6f1e7c2.tar.gz
Merge "Update the examples used for the trusted_dashboard option"8.0.0.0rc1
-rw-r--r--keystone/common/config.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py
index a09aca513..107fbbf55 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.'),