diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-19 15:54:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-19 15:54:46 +0000 |
| commit | 7cd0bb068245a8d426ff255353e63d4b8d367245 (patch) | |
| tree | 5bd0bc68ccaa79aebaed50fce0509990d1d6c6fa | |
| parent | cdc0ee1f85aa762f7d34297a034a10519ba9f40f (diff) | |
| parent | 96dea469c9de72a9ef6ee0c03833c4f3ff2f9f8f (diff) | |
Merge "Set default 'ou' name for LDAP projects to Projects"
| -rw-r--r-- | doc/source/configuration.rst | 4 | ||||
| -rw-r--r-- | etc/keystone.conf.sample | 2 | ||||
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 2181be8b..03fa1d63 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -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 diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 08154124..9a36316d 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -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 diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 3bc9a9c0..4d79e268 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -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' |