Merge "fix variable names to coincide with the ones in common.ldap" into stable/essex
This commit is contained in:
commit
46b3722245
|
@ -61,7 +61,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:
|
||||||
|
@ -243,7 +243,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',
|
||||||
|
@ -367,7 +367,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'}
|
||||||
|
|
Loading…
Reference in New Issue