opendev/system-config
Code Issues Proposed changes

Pull in the zookeeperd package instead of the zookeeper package

Browse Source 
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
This commit is contained in:
Joshua Harlow 2014-01-29 16:15:24 -08:00
parent edcbe72515
commit 90e6b63d8b
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'
$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 = [

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

@ -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,
}