openstack
/
keystone
Code Issues Proposed changes

Merge "Make the LDAP dependency clear between identity, resource & assignment"

This commit is contained in:
Jenkins 2015-03-05 16:44:36 +00:00 committed by Gerrit Code Review
parent 3cc751f073 74c50bde07
commit 4f37d29ca0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/configuration.rst
View File

@ -1660,6 +1660,13 @@ section:
user_allow_update = False
user_allow_delete = False
.. NOTE::
While having identity related infomration backed by LDAP while other
information is backed by SQL is a supported configuration, as shown above;
the opposite is not true. If either resource or assignment drivers are
configured for LDAP, then Identity must also be configured for LDAP.
Connection Pooling
------------------

6
keystone/assignment/backends/ldap.py
View File

@ -44,9 +44,9 @@ class Assignment(assignment.Driver):
self.LDAP_PASSWORD = CONF.ldap.password
self.suffix = CONF.ldap.suffix
# These are the only deep dependency from assignment back
# to identity. The assumption is that if you are using
# LDAP for assignments, you are using it for Id as well.
# This is the only deep dependency from assignment back to identity.
# This is safe to do since if you are using LDAP for assignment, it is
# required that you are using it for identity as well.
self.user = ldap_identity.UserApi(CONF)
self.group = ldap_identity.GroupApi(CONF)

6
keystone/resource/backends/ldap.py
View File

@ -39,9 +39,9 @@ class Resource(resource.Driver):
self.LDAP_PASSWORD = CONF.ldap.password
self.suffix = CONF.ldap.suffix
# This is the only deep dependency from resource back
# to identity. The assumption is that if you are using
# LDAP for resource, you are using it for identity as well.
# This is the only deep dependency from resource back to identity.
# This is safe to do since if you are using LDAP for resource, it is
# required that you are using it for identity as well.
self.user = ldap_identity.UserApi(CONF)
self.project = ProjectApi(CONF)