openstack/keystone
Code Issues Proposed changes

Merge "Change the default LDAP mapping for description."

Browse Source
This commit is contained in:
Jenkins 2013-02-22 00:27:16 +00:00 committed by Gerrit Code Review
commit 95815708eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/config.py
View File

@ -276,7 +276,7 @@ register_str('tenant_objectclass', group='ldap', default='groupOfNames')
register_str('tenant_id_attribute', group='ldap', default='cn')
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='desc')
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_list('tenant_attribute_ignore', group='ldap', default='')
@ -303,7 +303,7 @@ register_str('group_objectclass', group='ldap', default='groupOfNames')
register_str('group_id_attribute', group='ldap', default='cn')
register_str('group_name_attribute', group='ldap', default='ou')
register_str('group_member_attribute', group='ldap', default='member')
register_str('group_desc_attribute', group='ldap', default='desc')
register_str('group_desc_attribute', group='ldap', default='description')
register_str('group_domain_id_attribute', group='ldap', default='domain_id')
register_list('group_attribute_ignore', group='ldap', default='')
register_bool('group_allow_create', group='ldap', default=True)

4
keystone/identity/backends/ldap/core.py
View File

@ -496,7 +496,7 @@ class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap,
DEFAULT_ATTRIBUTE_IGNORE = []
options_name = 'tenant'
attribute_mapping = {'name': 'ou',
'description': 'desc',
'description': 'description',
'tenantId': 'cn',
'enabled': 'enabled',
'domain_id': 'domain_id'}
@ -912,7 +912,7 @@ class GroupApi(common_ldap.BaseLdap, ApiShimMixin):
DEFAULT_ATTRIBUTE_IGNORE = []
options_name = 'group'
attribute_mapping = {'name': 'ou',
'description': 'desc',
'description': 'description',
'groupId': 'cn',
'domain_id': 'domain_id'}
model = models.Group