opendev/system-config
Code Issues Proposed changes

Merge "No zookeeper packages on CentOS slaves"

Browse Source
This commit is contained in:
Jenkins 2013-12-17 16:03:29 +00:00 committed by Gerrit Code Review
commit 5ebf58f02a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,8 @@ class jenkins::params {
$xslt_package = 'libxslt'
$xvfb_package = 'xorg-x11-server-Xvfb'
# For Tooz unit tests
$zookeeper_package = 'zookeeper-server'
# FIXME: No zookeeper packages on RHEL
#$zookeeper_package = 'zookeeper-server'
$cgroups_package = 'libcgroup'
if ($::operatingsystem == 'Fedora') {
$cgroups_tools_package = 'libcgroup-tools'

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

@ -62,7 +62,6 @@ class jenkins::slave(
$::jenkins::params::unzip_package,
$::jenkins::params::xslt_package, # for building openstack docs
$::jenkins::params::xvfb_package, # for selenium tests
$::jenkins::params::zookeeper_package, # for tooz unit tests
]
if ($bare == false) {
@ -113,6 +112,11 @@ class jenkins::slave(
require => Package[$::jenkins::params::jdk_package],
}
# For Tooz unit tests
package { $::jenkins::params::zookeeper_package:
ensure => present,
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")