openstack/keystone
Code Issues Proposed changes

Merge "fix variable names to coincide with the ones in common.ldap"

Browse Source
This commit is contained in:
Jenkins 2012-07-03 21:06:39 +00:00 committed by Gerrit Code Review
commit 4d7c07bf1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class Identity(identity.Driver):
if self.LDAP_URL.startswith('fake://'): if self.LDAP_URL.startswith('fake://'):
conn = fakeldap.FakeLdap(self.LDAP_URL) conn = fakeldap.FakeLdap(self.LDAP_URL)
else: else:
conn = common_ldap.LDAPWrapper(self.LDAP_URL) conn = common_ldap.LdapWrapper(self.LDAP_URL)
if user is None: if user is None:
user = self.LDAP_USER user = self.LDAP_USER
if password is None: if password is None:
@ -284,7 +284,7 @@ class ApiShimMixin(object):
class UserApi(common_ldap.BaseLdap, ApiShimMixin): class UserApi(common_ldap.BaseLdap, ApiShimMixin):
DEFAULT_OU = 'ou=Users' DEFAULT_OU = 'ou=Users'
DEFAULT_STRUCTURAL_CLASSES = ['person'] DEFAULT_STRUCTURAL_CLASSES = ['person']
DEFAULT_ID_ATTRIBUTE = 'cn' DEFAULT_ID_ATTR = 'cn'
DEFAULT_OBJECTCLASS = 'inetOrgPerson' DEFAULT_OBJECTCLASS = 'inetOrgPerson'
options_name = 'user' options_name = 'user'
attribute_mapping = {'password': 'userPassword', attribute_mapping = {'password': 'userPassword',
@ -418,7 +418,7 @@ class TenantApi(common_ldap.BaseLdap, ApiShimMixin):
DEFAULT_OU = 'ou=Groups' DEFAULT_OU = 'ou=Groups'
DEFAULT_STRUCTURAL_CLASSES = [] DEFAULT_STRUCTURAL_CLASSES = []
DEFAULT_OBJECTCLASS = 'groupOfNames' DEFAULT_OBJECTCLASS = 'groupOfNames'
DEFAULT_ID_ATTRIBUTE = 'cn' DEFAULT_ID_ATTR = 'cn'
DEFAULT_MEMBER_ATTRIBUTE = 'member' DEFAULT_MEMBER_ATTRIBUTE = 'member'
options_name = 'tenant' options_name = 'tenant'
attribute_mapping = {'description': 'desc', 'name': 'ou'} attribute_mapping = {'description': 'desc', 'name': 'ou'}