openstack/puppet-keystone
Code Issues Proposed changes

Merge "support the ldap user_enabled_invert parameter"

Browse Source
This commit is contained in:
Jenkins 2014-11-27 01:31:16 +00:00 committed by Gerrit Code Review
commit 9b7ea1aacf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/ldap.pp
View File

@ -28,6 +28,7 @@ class keystone::ldap(
$user_enabled_attribute = undef,
$user_enabled_mask = undef,
$user_enabled_default = undef,
$user_enabled_invert = undef,
$user_attribute_ignore = undef,
$user_default_project_id_attribute = undef,
$user_allow_create = undef,
@ -124,6 +125,7 @@ class keystone::ldap(
'ldap/user_enabled_attribute': value => $user_enabled_attribute;
'ldap/user_enabled_mask': value => $user_enabled_mask;
'ldap/user_enabled_default': value => $user_enabled_default;
'ldap/user_enabled_invert': value => $user_enabled_invert;
'ldap/user_attribute_ignore': value => $user_attribute_ignore;
'ldap/user_default_project_id_attribute': value => $user_default_project_id_attribute;
'ldap/user_allow_create': value => $user_allow_create;

4
spec/classes/keystone_ldap_spec.rb
View File

@ -19,6 +19,7 @@ describe 'keystone::ldap' do
:user_enabled_attribute => 'UserAccountControl',
:user_enabled_mask => '2',
:user_enabled_default => '512',
:user_enabled_invert => 'False',
:user_attribute_ignore => '',
:user_default_project_id_attribute => 'defaultProject',
:user_allow_create => 'False',
@ -34,7 +35,7 @@ describe 'keystone::ldap' do
:tenant_id_attribute => 'ou',
:tenant_member_attribute => 'member',
:tenant_desc_attribute => 'description',
:tenant_name_attribute => 'ou',
:tenant_name_attribute => 'ou',
:tenant_enabled_attribute => 'enabled',
:tenant_domain_id_attribute => 'businessCategory',
:tenant_attribute_ignore => '',
@ -94,6 +95,7 @@ describe 'keystone::ldap' do
should contain_keystone_config('ldap/user_enabled_attribute').with_value('UserAccountControl')
should contain_keystone_config('ldap/user_enabled_mask').with_value('2')
should contain_keystone_config('ldap/user_enabled_default').with_value('512')
should contain_keystone_config('ldap/user_enabled_invert').with_value('False')
should contain_keystone_config('ldap/user_attribute_ignore').with_value('')
should contain_keystone_config('ldap/user_default_project_id_attribute').with_value('defaultProject')
should contain_keystone_config('ldap/user_tree_dn').with_value('cn=users,dc=example,dc=com')