diff options
| author | alatynskaya <alatynskaya@mirantis.com> | 2013-01-25 16:08:43 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2013-02-20 00:04:29 +0400 |
| commit | a791f45d7065e8cb72e044606690af1684dbf2af (patch) | |
| tree | f536b330e59c4ada9a77ef9311c72a9090d7f74d /keystone | |
| parent | 54509a2bcbb9f4fab6af54e87612e3ef04ec7a4a (diff) | |
| download | keystone-a791f45d7065e8cb72e044606690af1684dbf2af.tar.gz keystone-a791f45d7065e8cb72e044606690af1684dbf2af.tar.xz keystone-a791f45d7065e8cb72e044606690af1684dbf2af.zip | |
Change the default LDAP mapping for description.
Change-Id: I361ec7fde2dde8b9a2091446d4d9f3b95d98f306
Diffstat (limited to 'keystone')
| -rw-r--r-- | keystone/config.py | 4 | ||||
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/keystone/config.py b/keystone/config.py index da6582a5..7a2f16ea 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -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) diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index ec9df209..23f238f8 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -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 |