From a791f45d7065e8cb72e044606690af1684dbf2af Mon Sep 17 00:00:00 2001
From: alatynskaya <alatynskaya@mirantis.com>
Date: Fri, 25 Jan 2013 16:08:43 +0400
Subject: [PATCH] Change the default LDAP mapping for description.

Change-Id: I361ec7fde2dde8b9a2091446d4d9f3b95d98f306
---
 keystone/config.py                      | 4 ++--
 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 da6582a582..7a2f16eaba 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 ec9df20901..23f238f85a 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