diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 21:06:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 21:06:39 +0000 |
| commit | 4d7c07bf1d5c27a98bf36228277892bded4e5ac8 (patch) | |
| tree | 02f8d135fa267f79ca2637dbcbeda2010c8b608c | |
| parent | 1850fe09641afe2f3319c6279ab8ce2a69f85056 (diff) | |
| parent | bd94b4b81f6e235ce93134e64a923a79e43f36f7 (diff) | |
Merge "fix variable names to coincide with the ones in common.ldap"
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 9a44f65e..687d9b2b 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -62,7 +62,7 @@ class Identity(identity.Driver): if self.LDAP_URL.startswith('fake://'): conn = fakeldap.FakeLdap(self.LDAP_URL) else: - conn = common_ldap.LDAPWrapper(self.LDAP_URL) + conn = common_ldap.LdapWrapper(self.LDAP_URL) if user is None: user = self.LDAP_USER if password is None: @@ -284,7 +284,7 @@ class ApiShimMixin(object): class UserApi(common_ldap.BaseLdap, ApiShimMixin): DEFAULT_OU = 'ou=Users' DEFAULT_STRUCTURAL_CLASSES = ['person'] - DEFAULT_ID_ATTRIBUTE = 'cn' + DEFAULT_ID_ATTR = 'cn' DEFAULT_OBJECTCLASS = 'inetOrgPerson' options_name = 'user' attribute_mapping = {'password': 'userPassword', @@ -418,7 +418,7 @@ class TenantApi(common_ldap.BaseLdap, ApiShimMixin): DEFAULT_OU = 'ou=Groups' DEFAULT_STRUCTURAL_CLASSES = [] DEFAULT_OBJECTCLASS = 'groupOfNames' - DEFAULT_ID_ATTRIBUTE = 'cn' + DEFAULT_ID_ATTR = 'cn' DEFAULT_MEMBER_ATTRIBUTE = 'member' options_name = 'tenant' attribute_mapping = {'description': 'desc', 'name': 'ou'} |