openstack/keystone
Code Issues Proposed changes

Change the default LDAP mapping for description.

Browse Source 
Change-Id: I361ec7fde2dde8b9a2091446d4d9f3b95d98f306
This commit is contained in:
alatynskaya 2013-01-25 16:08:43 +04:00 committed by Yuriy Taraday
parent 54509a2bcb
commit a791f45d70
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

@ -273,7 +273,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='')
@ -298,7 +298,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

@ -495,7 +495,7 @@ class ProjectApi(common_ldap.BaseLdap, ApiShimMixin):
DEFAULT_ATTRIBUTE_IGNORE = []
options_name = 'tenant'
attribute_mapping = {'name': 'ou',
'description': 'desc',
'description': 'description',
'tenantId': 'cn',
'enabled': 'enabled',
'domain_id': 'domain_id'}
@ -911,7 +911,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