diff options
| -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 936926d9..a96073c6 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -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) diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 24c8a2b3..53a7d977 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -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 |