Advertisement
Guest User

Untitled

a guest
Jul 18th, 2014
198
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.99 KB | None | 0 0
  1. diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
  2. index cd27f9e..47635fb 100644
  3. --- a/keystone/assignment/backends/ldap.py
  4. +++ b/keystone/assignment/backends/ldap.py
  5. @@ -411,6 +411,7 @@ class ProjectApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap):
  6.      notfound_arg = 'project_id'  # NOTE(yorik-sar): while options_name = tenant
  7.      options_name = 'project'
  8.      attribute_options_names = {'name': 'name',
  9. +                               'id': 'id',
  10.                                 'description': 'desc',
  11.                                 'enabled': 'enabled',
  12.                                 'domain_id': 'domain_id'}
  13. @@ -491,7 +492,8 @@ class RoleApi(common_ldap.BaseLdap):
  14.      DEFAULT_MEMBER_ATTRIBUTE = 'roleOccupant'
  15.      NotFound = exception.RoleNotFound
  16.      options_name = 'role'
  17. -    attribute_options_names = {'name': 'name'}
  18. +    attribute_options_names = {'name': 'name',
  19. +                               'id': 'id'}
  20.      immutable_attrs = ['id']
  21.      model = models.Role
  22.  
  23. diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
  24. index 517674c..7c1f5b5 100644
  25. --- a/keystone/identity/backends/ldap.py
  26. +++ b/keystone/identity/backends/ldap.py
  27. @@ -193,6 +193,7 @@ class UserApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap):
  28.      attribute_options_names = {'password': 'pass',
  29.                                 'email': 'mail',
  30.                                 'name': 'name',
  31. +                               'id': 'id',
  32.                                 'enabled': 'enabled',
  33.                                 'default_project_id': 'default_project_id'}
  34.      immutable_attrs = ['id']
  35. @@ -256,6 +257,7 @@ class GroupApi(common_ldap.BaseLdap):
  36.      NotFound = exception.GroupNotFound
  37.      options_name = 'group'
  38.      attribute_options_names = {'description': 'desc',
  39. +                               'id': 'id',
  40.                                 'name': 'name'}
  41.      immutable_attrs = ['name']
  42.      model = models.Group
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement