Merge "Add python-ldappool as a requirement for LDAP"

Jenkins · openstack-gerrit · commit 38518cbcb3ef · 2014-11-04T16:50:04.000Z
diff --git a/manifests/ldap.pp b/manifests/ldap.pp
@@ -84,7 +84,8 @@
   $assignment_driver                   = undef,
 ) {
 
-  package { 'python-ldap':
+  $ldap_packages = ['python-ldap', 'python-ldappool']
+  package { $ldap_packages:
       ensure => present,
   }
 
diff --git a/spec/classes/keystone_ldap_spec.rb b/spec/classes/keystone_ldap_spec.rb
@@ -76,6 +76,7 @@
       }
     end
     it { should contain_package('python-ldap') }
+    it { should contain_package('python-ldappool') }
     it 'should have basic params' do
       should contain_keystone_config('ldap/url').with_value('ldap://foo')
       should contain_keystone_config('ldap/user').with_value('cn=foo,dc=example,dc=com')

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@`
`84`	`84`	`$assignment_driver = undef,`
`85`	`85`	`) {`
`86`	`86`
`87`		`- package { 'python-ldap':`
	`87`	`+ $ldap_packages = ['python-ldap', 'python-ldappool']`
	`88`	`+ package { $ldap_packages:`
`88`	`89`	`ensure => present,`
`89`	`90`	`}`
`90`	`91`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@`
`76`	`76`	`}`
`77`	`77`	`end`
`78`	`78`	`it { should contain_package('python-ldap') }`
	`79`	`+ it { should contain_package('python-ldappool') }`
`79`	`80`	`it 'should have basic params' do`
`80`	`81`	`should contain_keystone_config('ldap/url').with_value('ldap://foo')`
`81`	`82`	`should contain_keystone_config('ldap/user').with_value('cn=foo,dc=example,dc=com')`