opendev/system-config
Code Issues Proposed changes

Alter zookeeper params for Fedora.

Browse Source 
The zookeeper package for Fedora is zookeeper, instead of
zookeeper-server. This patch fix this problem when you
try to apply puppet jenkins slave on Fedora

Change-Id: I868987fa7f8c989e27444a6241a57f62372e645d
This commit is contained in:
Arx Cruz 2013-12-17 11:44:58 -02:00
parent 265494334d
commit 5048a68fc5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ class jenkins::params {
#$zookeeper_package = 'zookeeper-server' #$zookeeper_package = 'zookeeper-server'
$cgroups_package = 'libcgroup' $cgroups_package = 'libcgroup'
if ($::operatingsystem == 'Fedora') { if ($::operatingsystem == 'Fedora') {
$zookeeper_package = 'zookeeper'
$cgroups_tools_package = 'libcgroup-tools' $cgroups_tools_package = 'libcgroup-tools'
$cgconfig_require = [ $cgconfig_require = [
Package['cgroups'], Package['cgroups'],

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

@ -82,6 +82,11 @@ class jenkins::slave(
command => '/usr/bin/yum -y groupinstall "Development tools"', command => '/usr/bin/yum -y groupinstall "Development tools"',
} }
if ($::operatingsystem == 'Fedora') {
package { $::jenkins::params::zookeeper_package:
ensure => present,
}
}
} }
'Debian': { 'Debian': {