summaryrefslogtreecommitdiffstats
path: root/keystone/config.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-09 13:56:33 +0000
committerGerrit Code Review <review@openstack.org>2012-10-09 13:56:33 +0000
commit8236d3b4f6945f6057252e6bc195bec103e9b12d (patch)
treea45281c83541050be0551a4b4c4a5c2bbbb526d2 /keystone/config.py
parente7fdf934f5a082dc58a542b54e1eb24b9054af2d (diff)
parent8152c2cb8698ce1fc868c02f2fa4d4301afc5738 (diff)
downloadkeystone-8236d3b4f6945f6057252e6bc195bec103e9b12d.tar.gz
keystone-8236d3b4f6945f6057252e6bc195bec103e9b12d.tar.xz
keystone-8236d3b4f6945f6057252e6bc195bec103e9b12d.zip
Merge "Configurable actions on LDAP backend in users Active Directory (bug 1052929)"
Diffstat (limited to 'keystone/config.py')
-rw-r--r--keystone/config.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/keystone/config.py b/keystone/config.py
index b2e9c1ea..37ce6644 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -165,21 +165,29 @@ register_str('suffix', group='ldap', default='cn=example,cn=com')
register_bool('use_dumb_member', group='ldap', default=False)
register_str('user_name_attribute', group='ldap', default='sn')
-
register_str('user_tree_dn', group='ldap', default=None)
register_str('user_objectclass', group='ldap', default='inetOrgPerson')
register_str('user_id_attribute', group='ldap', default='cn')
+register_bool('user_allow_create', group='ldap', default=True)
+register_bool('user_allow_update', group='ldap', default=True)
+register_bool('user_allow_delete', group='ldap', default=True)
register_str('tenant_tree_dn', group='ldap', default=None)
register_str('tenant_objectclass', group='ldap', default='groupOfNames')
register_str('tenant_id_attribute', group='ldap', default='cn')
register_str('tenant_member_attribute', group='ldap', default='member')
register_str('tenant_name_attribute', group='ldap', default='ou')
+register_bool('tenant_allow_create', group='ldap', default=True)
+register_bool('tenant_allow_update', group='ldap', default=True)
+register_bool('tenant_allow_delete', group='ldap', default=True)
register_str('role_tree_dn', group='ldap', default=None)
register_str('role_objectclass', group='ldap', default='organizationalRole')
register_str('role_id_attribute', group='ldap', default='cn')
register_str('role_member_attribute', group='ldap', default='roleOccupant')
+register_bool('role_allow_create', group='ldap', default=True)
+register_bool('role_allow_update', group='ldap', default=True)
+register_bool('role_allow_delete', group='ldap', default=True)
#pam
register_str('url', group='pam', default=None)