From b978211b816da8387db91ba620da935b13b135ee Mon Sep 17 00:00:00 2001 From: Brad Topol Date: Sun, 24 Feb 2013 23:35:48 -0600 Subject: domain_id_attributes in config.py have wrong default value Also, as requested I put in this bug fix the related updates to keystone.conf.sample Fixes Bug1131443 Fixes Bug1131439 Change-Id: I3e973c8f8ad2783153a2ccb3d743b65eec47e749 --- etc/keystone.conf.sample | 2 ++ keystone/config.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 8c49f68e..b50ec760 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -145,6 +145,7 @@ # user_tree_dn = ou=Users,dc=example,dc=com # user_filter = # user_objectclass = inetOrgPerson +# user_domain_id_attribute = businessCategory # user_id_attribute = cn # user_name_attribute = sn # user_mail_attribute = email @@ -162,6 +163,7 @@ # tenant_tree_dn = ou=Groups,dc=example,dc=com # tenant_filter = # tenant_objectclass = groupOfNames +# tenant_domain_id_attribute = businessCategory # tenant_id_attribute = cn # tenant_member_attribute = member # tenant_name_attribute = ou diff --git a/keystone/config.py b/keystone/config.py index a96073c6..b67d477a 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -259,7 +259,8 @@ register_str('user_name_attribute', group='ldap', default='sn') register_str('user_mail_attribute', group='ldap', default='email') register_str('user_pass_attribute', group='ldap', default='userPassword') register_str('user_enabled_attribute', group='ldap', default='enabled') -register_str('user_domain_id_attribute', group='ldap', default='domain_id') +register_str('user_domain_id_attribute', group='ldap', + default='businessCategory') register_int('user_enabled_mask', group='ldap', default=0) register_str('user_enabled_default', group='ldap', default='True') register_list('user_attribute_ignore', group='ldap', @@ -278,7 +279,8 @@ register_str('tenant_member_attribute', group='ldap', default='member') register_str('tenant_name_attribute', group='ldap', default='ou') register_str('tenant_desc_attribute', group='ldap', default='description') register_str('tenant_enabled_attribute', group='ldap', default='enabled') -register_str('tenant_domain_id_attribute', group='ldap', default='domain_id') +register_str('tenant_domain_id_attribute', group='ldap', + default='businessCategory') register_list('tenant_attribute_ignore', group='ldap', default='') register_bool('tenant_allow_create', group='ldap', default=True) register_bool('tenant_allow_update', group='ldap', default=True) -- cgit