openstack
/
keystone
Code Issues Proposed changes

Merge "Set default 'ou' name for LDAP projects to Projects"

This commit is contained in:
Jenkins 2013-06-19 15:54:46 +00:00 committed by Gerrit Code Review
parent cdc0ee1f85 96dea469c9
commit 7cd0bb0682
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configuration.rst
View File

@ -1008,7 +1008,7 @@ for openstack would look like this::
objectClass: organizationalUnit
ou: openstack
dn: ou=Groups,dc=openstack,dc=org
dn: ou=Projects,dc=openstack,dc=org
objectClass: top
objectClass: organizationalUnit
ou: groups
@ -1036,7 +1036,7 @@ The corresponding entries in the Keystone configuration file are::
user_tree_dn = ou=Users,dc=openstack,dc=org
user_objectclass = inetOrgPerson
tenant_tree_dn = ou=Groups,dc=openstack,dc=org
tenant_tree_dn = ou=Projects,dc=openstack,dc=org
tenant_objectclass = groupOfNames
role_tree_dn = ou=Roles,dc=openstack,dc=org

2
etc/keystone.conf.sample
View File

@ -192,7 +192,7 @@
# user_enabled_emulation = False
# user_enabled_emulation_dn =
# tenant_tree_dn = ou=Groups,dc=example,dc=com
# tenant_tree_dn = ou=Projects,dc=example,dc=com
# tenant_filter =
# tenant_objectclass = groupOfNames
# tenant_domain_id_attribute = businessCategory

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

@ -492,7 +492,7 @@ class UserApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap, ApiShimMixin):
# TODO(termie): turn this into a data object and move logic to driver
class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap,
ApiShimMixin):
DEFAULT_OU = 'ou=Groups'
DEFAULT_OU = 'ou=Projects'
DEFAULT_STRUCTURAL_CLASSES = []
DEFAULT_OBJECTCLASS = 'groupOfNames'
DEFAULT_ID_ATTR = 'cn'