opendev/system-config
Code Issues Proposed changes

Merge "Install memcached on slaves"

Browse Source
This commit is contained in:
Jenkins 2014-03-06 23:15:50 +00:00 committed by Gerrit Code Review
commit afe0b82d28
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@ class jenkins::params {
$libffi_dev_package = 'libffi-devel' $libffi_dev_package = 'libffi-devel'
# FIXME: No Maven packages on RHEL # FIXME: No Maven packages on RHEL
#$maven_package = 'maven' #$maven_package = 'maven'
# For tooz unit tests
$memcached_package = 'memcached'
# For Ceilometer unit tests # For Ceilometer unit tests
$mongodb_package = 'mongodb-server' $mongodb_package = 'mongodb-server'
$pandoc_package = 'pandoc' $pandoc_package = 'pandoc'
@ -119,6 +121,8 @@ class jenkins::params {
$libxslt_dev_package = 'libxslt1-dev' $libxslt_dev_package = 'libxslt1-dev'
$libffi_dev_package = 'libffi-dev' $libffi_dev_package = 'libffi-dev'
$maven_package = 'maven2' $maven_package = 'maven2'
# For tooz unit tests
$memcached_package = 'memcached'
# For Ceilometer unit tests # For Ceilometer unit tests
$mongodb_package = 'mongodb' $mongodb_package = 'mongodb'
$pandoc_package = 'pandoc' $pandoc_package = 'pandoc'

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

@ -48,6 +48,7 @@ class jenkins::slave(
$::jenkins::params::librrd_dev_package, # for python-rrdtool, used by kwapi $::jenkins::params::librrd_dev_package, # for python-rrdtool, used by kwapi
$::jenkins::params::libtidy_package, # for python-tidy, used by sphinxcontrib-docbookrestapi $::jenkins::params::libtidy_package, # for python-tidy, used by sphinxcontrib-docbookrestapi
$::jenkins::params::libsasl_dev, # for keystone ldap auth integration $::jenkins::params::libsasl_dev, # for keystone ldap auth integration
$::jenkins::params::memcached_package, # for tooz unit tests
$::jenkins::params::mongodb_package, # for ceilometer unit tests $::jenkins::params::mongodb_package, # for ceilometer unit tests
$::jenkins::params::mysql_dev_package, $::jenkins::params::mysql_dev_package,
$::jenkins::params::nspr_dev_package, # for spidermonkey, used by ceilometer $::jenkins::params::nspr_dev_package, # for spidermonkey, used by ceilometer