diff options
| author | Jose Castro Leon <jose.castro.leon@cern.ch> | 2012-10-29 15:07:58 +0100 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-11-13 10:37:17 -0600 |
| commit | 001f708e7d9ffc69c80f823e7ab5f79325cc8a40 (patch) | |
| tree | 9181d119b43770f27c8e7fff0293d18909a7f503 /keystone/config.py | |
| parent | 8dcafd81dfa0ccd958b614c12eee091a325ec5c4 (diff) | |
| download | keystone-001f708e7d9ffc69c80f823e7ab5f79325cc8a40.tar.gz keystone-001f708e7d9ffc69c80f823e7ab5f79325cc8a40.tar.xz keystone-001f708e7d9ffc69c80f823e7ab5f79325cc8a40.zip | |
Provide config file fields for enable users in LDAP backend (bug1067516)
DocImpact
Change-Id: I1ee9a1e2505cdd8c9ee8acba5c0e89a4f25c7262
Diffstat (limited to 'keystone/config.py')
| -rw-r--r-- | keystone/config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keystone/config.py b/keystone/config.py index bfded4ec..f1bfbd87 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -186,8 +186,11 @@ register_str('user_id_attribute', group='ldap', default='cn') register_str('user_name_attribute', group='ldap', default='sn') register_str('user_mail_attribute', group='ldap', default='email') register_str('user_pass_attribute', group='ldap', default='userPassword') +register_str('user_enabled_attribute', group='ldap', default='enabled') +register_int('user_enabled_mask', group='ldap', default=0) +register_str('user_enabled_default', group='ldap', default='True') register_list('user_attribute_ignore', group='ldap', - default='tenant_id,enable,tenants') + default='tenant_id,tenants') 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) @@ -199,7 +202,8 @@ 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_str('tenant_desc_attribute', group='ldap', default='desc') -register_list('tenant_attribute_ignore', group='ldap', default='enabled') +register_str('tenant_enabled_attribute', group='ldap', default='enabled') +register_list('tenant_attribute_ignore', group='ldap', default='') 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) |