From 90e6b63d8b4097ae4890e890e2ed33cd9bc66dfd Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 29 Jan 2014 16:15:24 -0800 Subject: [PATCH] Pull in the zookeeperd package instead of the zookeeper package Instead of installing the zookeeper package (which is just the basic files) we should just install the zookeeperd package (which includes the upstart scripts to run the zookeeper server) so that those who want to test against zookeeper do not have to start/stop the server. Change-Id: I83ee1c30fb8adb345f36c5facf3f06dcf059ef0f --- modules/jenkins/manifests/params.pp | 4 ++-- modules/jenkins/manifests/slave.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index c00ae2d4ae..9b00532544 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -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 = [ diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index c1b63e8ec1..9227c175bd 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -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, }