openstack/keystone
Code Issues Proposed changes

Merge "Remove ldap identity domain attribute options"

Browse Source
This commit is contained in:
Jenkins 2013-09-23 18:47:35 +00:00 committed by Gerrit Code Review
commit 66d7c2c4dd
3 changed files with 1 additions and 8 deletions
etc
keystone.conf.sample
keystone
common
config.py
identity/backends
ldap.py

1
etc/keystone.conf.sample

@ -341,7 +341,6 @@
# user_tree_dn = ou=Users,dc=example,dc=com
# user_filter =
# user_objectclass = inetOrgPerson
# user_domain_id_attribute = businessCategory
# user_id_attribute = cn
# user_name_attribute = sn
# user_mail_attribute = email

4
keystone/common/config.py

@ -178,8 +178,6 @@ FILE_OPTIONS = {
cfg.StrOpt('user_mail_attribute', default='email'),
cfg.StrOpt('user_pass_attribute', default='userPassword'),
cfg.StrOpt('user_enabled_attribute', default='enabled'),
cfg.StrOpt('user_domain_id_attribute',
default='businessCategory'),
cfg.IntOpt('user_enabled_mask', default=0),
cfg.StrOpt('user_enabled_default', default='True'),
cfg.ListOpt('user_attribute_ignore',
@ -232,8 +230,6 @@ FILE_OPTIONS = {
cfg.StrOpt('group_name_attribute', default='ou'),
cfg.StrOpt('group_member_attribute', default='member'),
cfg.StrOpt('group_desc_attribute', default='description'),
cfg.StrOpt('group_domain_id_attribute',
default='businessCategory'),
cfg.ListOpt('group_attribute_ignore', default=''),
cfg.BoolOpt('group_allow_create', default=True),
cfg.BoolOpt('group_allow_update', default=True),

4
keystone/identity/backends/ldap.py

@ -194,7 +194,6 @@ class UserApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap):
'email': 'mail',
'name': 'name',
'enabled': 'enabled',
'domain_id': 'domain_id',
'default_project_id': 'default_project_id'}
immutable_attrs = ['id']
@ -253,8 +252,7 @@ class GroupApi(common_ldap.BaseLdap):
NotFound = exception.GroupNotFound
options_name = 'group'
attribute_options_names = {'description': 'desc',
'name': 'name',
'domain_id': 'domain_id'}
'name': 'name'}
immutable_attrs = ['name']
model = models.Group