openstack
/
keystone
Code Issues Proposed changes

Merge "Refactor: [ldap] suffix should not be an instance attribute"

This commit is contained in:
Jenkins 2016-07-08 15:25:52 +00:00 committed by Gerrit Code Review
parent b5b7c692b9 c987d4d741
commit d03a84ea8b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keystone/identity/backends/ldap/common.py
View File

@ -1167,10 +1167,9 @@ class BaseLdap(object):
self.auth_pool_conn_lifetime = conf.ldap.auth_pool_connection_lifetime
if self.options_name is not None:
self.suffix = conf.ldap.suffix
dn = '%s_tree_dn' % self.options_name
self.tree_dn = (getattr(conf.ldap, dn)
or '%s,%s' % (self.DEFAULT_OU, self.suffix))
self.tree_dn = (
getattr(conf.ldap, '%s_tree_dn' % self.options_name)
or '%s,%s' % (self.DEFAULT_OU, conf.ldap.suffix))
idatt = '%s_id_attribute' % self.options_name
self.id_attr = getattr(conf.ldap, idatt) or self.DEFAULT_ID_ATTR