openstack/keystone
Code Issues Proposed changes

Enable emulation for domains

Browse Source 
Fixes bug #1157727

Change-Id: I3760469b8000cfc5fb461bb9ede5d0e140413dd7
This commit is contained in:
Sahdev Zala 2013-03-20 16:47:42 -05:00 committed by Dolph Mathews
parent aa58233bd8
commit 53450e29f1
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/common/config.py
View File

@ -344,6 +344,8 @@ def configure():
register_bool('domain_allow_create', group='ldap', default=True) register_bool('domain_allow_create', group='ldap', default=True)
register_bool('domain_allow_update', group='ldap', default=True) register_bool('domain_allow_update', group='ldap', default=True)
register_bool('domain_allow_delete', group='ldap', default=True) register_bool('domain_allow_delete', group='ldap', default=True)
register_bool('domain_enabled_emulation', group='ldap', default=False)
register_str('domain_enabled_emulation_dn', group='ldap', default=None)
# pam # pam
register_str('url', group='pam', default=None) register_str('url', group='pam', default=None)

3
keystone/identity/backends/ldap/core.py
View File

@ -928,7 +928,8 @@ class GroupApi(common_ldap.BaseLdap, ApiShimMixin):
return users return users
class DomainApi(common_ldap.BaseLdap, ApiShimMixin): class DomainApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap,
ApiShimMixin):
DEFAULT_OU = 'ou=Domains' DEFAULT_OU = 'ou=Domains'
DEFAULT_STRUCTURAL_CLASSES = [] DEFAULT_STRUCTURAL_CLASSES = []
DEFAULT_OBJECTCLASS = 'groupOfNames' DEFAULT_OBJECTCLASS = 'groupOfNames'

2
tests/_ldap_livetest.py
View File

@ -69,7 +69,7 @@ class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
'ou': 'Projects'}) 'ou': 'Projects'})
create_object(CONF.ldap.domain_tree_dn, create_object(CONF.ldap.domain_tree_dn,
{'objectclass': 'organizationalUnit', {'objectclass': 'organizationalUnit',
'ou': 'Domain'}) 'ou': 'Domains'})
create_object(CONF.ldap.group_tree_dn, create_object(CONF.ldap.group_tree_dn,
{'objectclass': 'organizationalUnit', {'objectclass': 'organizationalUnit',
'ou': 'UserGroups'}) 'ou': 'UserGroups'})

1
tests/backend_liveldap.conf
View File

@ -10,6 +10,7 @@ domain_tree_dn = ou=Domains,dc=openstack,dc=org
user_tree_dn = ou=Users,dc=openstack,dc=org user_tree_dn = ou=Users,dc=openstack,dc=org
tenant_enabled_emulation = True tenant_enabled_emulation = True
user_enabled_emulation = True user_enabled_emulation = True
domain_enabled_emulation = True
user_mail_attribute = mail user_mail_attribute = mail
use_dumb_member = True use_dumb_member = True