Merge "Pull in the zookeeperd package instead of the zookeeper package"
This commit is contained in:
commit
3abecd6567
@ -126,8 +126,8 @@ class jenkins::params {
|
||||
$unzip_package = 'unzip'
|
||||
$xslt_package = 'xsltproc'
|
||||
$xvfb_package = 'xvfb'
|
||||
# For Tooz unit tests
|
||||
$zookeeper_package = 'zookeeper'
|
||||
# For [tooz, taskflow, nova] using zookeeper in unit tests
|
||||
$zookeeper_package = 'zookeeperd'
|
||||
$cgroups_package = 'cgroup-bin'
|
||||
$cgroups_tools_package = ''
|
||||
$cgconfig_require = [
|
||||
|
@ -122,7 +122,7 @@ class jenkins::slave(
|
||||
require => Package[$::jenkins::params::jdk_package],
|
||||
}
|
||||
|
||||
# For Tooz unit tests
|
||||
# For [tooz, taskflow, nova] using zookeeper in unit tests
|
||||
package { $::jenkins::params::zookeeper_package:
|
||||
ensure => present,
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user