Enable emulation for domains

Fixes bug #1157727 Change-Id: I3760469b8000cfc5fb461bb9ede5d0e140413dd7
openstack · Mar 20, 2013 · 53450e2 · 53450e2
1 parent aa58233
commit 53450e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/keystone/common/config.py b/keystone/common/config.py
@@ -344,6 +344,8 @@ def configure():
     register_bool('domain_allow_create', 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_enabled_emulation', group='ldap', default=False)
+    register_str('domain_enabled_emulation_dn', group='ldap', default=None)
 
     # pam
     register_str('url', group='pam', default=None)

diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
@@ -928,7 +928,8 @@ def list_group_users(self, group_id):
         return users
 
 
-class DomainApi(common_ldap.BaseLdap, ApiShimMixin):
+class DomainApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap,
+                ApiShimMixin):
     DEFAULT_OU = 'ou=Domains'
     DEFAULT_STRUCTURAL_CLASSES = []
     DEFAULT_OBJECTCLASS = 'groupOfNames'

diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
@@ -69,7 +69,7 @@ def clear_database(self):
                       'ou': 'Projects'})
         create_object(CONF.ldap.domain_tree_dn,
                       {'objectclass': 'organizationalUnit',
-                      'ou': 'Domain'})
+                      'ou': 'Domains'})
         create_object(CONF.ldap.group_tree_dn,
                       {'objectclass': 'organizationalUnit',
                       'ou': 'UserGroups'})

diff --git a/tests/backend_liveldap.conf b/tests/backend_liveldap.conf
@@ -10,6 +10,7 @@ domain_tree_dn = ou=Domains,dc=openstack,dc=org
 user_tree_dn = ou=Users,dc=openstack,dc=org
 tenant_enabled_emulation = True
 user_enabled_emulation = True
+domain_enabled_emulation = True
 user_mail_attribute = mail
 use_dumb_member = True