diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-22 00:27:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-22 00:27:16 +0000 |
| commit | 95815708ebc2cacc7d3b1da0602aebc791ac2258 (patch) | |
| tree | 427ffb238c21a0960508140f580fe1c2bc5f5609 /keystone/config.py | |
| parent | 184edf8498a3340c87977e21dc4cc0b3f3f2cef7 (diff) | |
| parent | a791f45d7065e8cb72e044606690af1684dbf2af (diff) | |
| download | keystone-95815708ebc2cacc7d3b1da0602aebc791ac2258.tar.gz keystone-95815708ebc2cacc7d3b1da0602aebc791ac2258.tar.xz keystone-95815708ebc2cacc7d3b1da0602aebc791ac2258.zip | |
Merge "Change the default LDAP mapping for description."
Diffstat (limited to 'keystone/config.py')
| -rw-r--r-- | keystone/config.py | 4 |
1 files changed, 2 insertions, 2 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) |