opendev/system-config
Code Issues Proposed changes

Merge "Pull in the zookeeperd package instead of the zookeeper package"

Browse Source
This commit is contained in:
Jenkins 2014-01-30 00:41:12 +00:00 committed by Gerrit Code Review
commit 3abecd6567
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/jenkins/manifests/params.pp
View File

@ -126,8 +126,8 @@ class jenkins::params {
$unzip_package = 'unzip' $unzip_package = 'unzip'
$xslt_package = 'xsltproc' $xslt_package = 'xsltproc'
$xvfb_package = 'xvfb' $xvfb_package = 'xvfb'
# For Tooz unit tests # For [tooz, taskflow, nova] using zookeeper in unit tests
$zookeeper_package = 'zookeeper' $zookeeper_package = 'zookeeperd'
$cgroups_package = 'cgroup-bin' $cgroups_package = 'cgroup-bin'
$cgroups_tools_package = '' $cgroups_tools_package = ''
$cgconfig_require = [ $cgconfig_require = [

2
modules/jenkins/manifests/slave.pp
View File

@ -122,7 +122,7 @@ class jenkins::slave(
require => Package[$::jenkins::params::jdk_package], require => Package[$::jenkins::params::jdk_package],
} }
# For Tooz unit tests # For [tooz, taskflow, nova] using zookeeper in unit tests
package { $::jenkins::params::zookeeper_package: package { $::jenkins::params::zookeeper_package:
ensure => present, ensure => present,
} }