diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-10 00:57:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-10 00:57:58 +0000 |
commit | 09b74bd16023b85da48cea0bf1227f6ad2252cff (patch) | |
tree | 1fa4ae49b455529682a89ae327f5e1660fd1e033 /keystone/assignment | |
parent | ecb62d3ec07c23d9f02227bd0873e5c4115f7324 (diff) | |
parent | 6f954d2c2982a6096c13053dafd96ebddc6017bb (diff) | |
download | keystone-09b74bd16023b85da48cea0bf1227f6ad2252cff.tar.gz keystone-09b74bd16023b85da48cea0bf1227f6ad2252cff.tar.xz keystone-09b74bd16023b85da48cea0bf1227f6ad2252cff.zip |
Merge "Abstract out attribute_ignore assigning in LDAP driver"
Diffstat (limited to 'keystone/assignment')
-rw-r--r-- | keystone/assignment/backends/ldap.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py index 34cd9c2f..718d38c3 100644 --- a/keystone/assignment/backends/ldap.py +++ b/keystone/assignment/backends/ldap.py @@ -263,7 +263,6 @@ class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap): DEFAULT_OBJECTCLASS = 'groupOfNames' DEFAULT_ID_ATTR = 'cn' DEFAULT_MEMBER_ATTRIBUTE = 'member' - DEFAULT_ATTRIBUTE_IGNORE = [] NotFound = exception.ProjectNotFound notfound_arg = 'project_id' # NOTE(yorik-sar): while options_name = tenant options_name = 'tenant' @@ -277,8 +276,6 @@ class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap): super(ProjectApi, self).__init__(conf) self.member_attribute = (getattr(conf.ldap, 'tenant_member_attribute') or self.DEFAULT_MEMBER_ATTRIBUTE) - self.attribute_ignore = (getattr(conf.ldap, 'tenant_attribute_ignore') - or self.DEFAULT_ATTRIBUTE_IGNORE) def create(self, values): self.affirm_unique(values) @@ -375,7 +372,6 @@ class RoleApi(common_ldap.BaseLdap): DEFAULT_STRUCTURAL_CLASSES = [] DEFAULT_OBJECTCLASS = 'organizationalRole' DEFAULT_MEMBER_ATTRIBUTE = 'roleOccupant' - DEFAULT_ATTRIBUTE_IGNORE = [] NotFound = exception.RoleNotFound options_name = 'role' attribute_options_names = {'name': 'name'} @@ -385,8 +381,6 @@ class RoleApi(common_ldap.BaseLdap): super(RoleApi, self).__init__(conf) self.member_attribute = (getattr(conf.ldap, 'role_member_attribute') or self.DEFAULT_MEMBER_ATTRIBUTE) - self.attribute_ignore = (getattr(conf.ldap, 'role_attribute_ignore') - or self.DEFAULT_ATTRIBUTE_IGNORE) def get(self, id, filter=None): model = super(RoleApi, self).get(id, filter) |