From 5048a68fc575e44aad4c4a4a63f62e82ba3f5c02 Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Tue, 17 Dec 2013 11:44:58 -0200 Subject: [PATCH] Alter zookeeper params for Fedora. 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 --- modules/jenkins/manifests/params.pp | 1 + modules/jenkins/manifests/slave.pp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index c75764f7bd..c911efca72 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -55,6 +55,7 @@ class jenkins::params { #$zookeeper_package = 'zookeeper-server' $cgroups_package = 'libcgroup' if ($::operatingsystem == 'Fedora') { + $zookeeper_package = 'zookeeper' $cgroups_tools_package = 'libcgroup-tools' $cgconfig_require = [ Package['cgroups'], diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 3a71613d0e..e33a3b5ca3 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -82,6 +82,11 @@ class jenkins::slave( command => '/usr/bin/yum -y groupinstall "Development tools"', } + if ($::operatingsystem == 'Fedora') { + package { $::jenkins::params::zookeeper_package: + ensure => present, + } + } } 'Debian': {