From 7a5a0e4df646d46476ec7a9fcdedd638e8781f6e Mon Sep 17 00:00:00 2001 From: asteroide Date: Wed, 2 Dec 2015 09:49:33 +0100 Subject: Update keystone to the branch stable/liberty. Change-Id: I7cce62ae4b4cbca525a7b9499285455bdd04993e --- keystone-moon/etc/keystone.conf.sample | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'keystone-moon/etc/keystone.conf.sample') diff --git a/keystone-moon/etc/keystone.conf.sample b/keystone-moon/etc/keystone.conf.sample index 9c76fc0d..8e5ea13b 100644 --- a/keystone-moon/etc/keystone.conf.sample +++ b/keystone-moon/etc/keystone.conf.sample @@ -760,8 +760,8 @@ # A list of trusted dashboard hosts. Before accepting a Single Sign-On request # to return a 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/auth/websso -# trusted_dashboard=http://beta.com/auth/websso (multi valued) +# example: trusted_dashboard=http://acme.com trusted_dashboard=http://beta.com +# (multi valued) #trusted_dashboard = # Location of Single Sign-On callback handler, will return a token to a trusted @@ -1019,6 +1019,10 @@ # (string value) #user_enabled_emulation_dn = +# Use the "group_member_attribute" and "group_objectclass" settings to +# determine membership in the emulated enabled group. (boolean value) +#user_enabled_emulation_use_group_config = false + # List of additional LDAP attributes used for mapping additional attribute # mappings for users. Attribute mapping format is :, # where ldap_attr is the attribute in the LDAP entry and user_attr is the @@ -1118,6 +1122,10 @@ # Its value may be silently ignored in the future. #project_enabled_emulation_dn = +# Use the "group_member_attribute" and "group_objectclass" settings to +# determine membership in the emulated enabled group. (boolean value) +#project_enabled_emulation_use_group_config = false + # Additional attribute mappings for projects. Attribute mapping format is # :, where ldap_attr is the attribute in the LDAP entry # and user_attr is the Identity API attribute. (list value) -- cgit 1.2.3-korg