From ddf0b32212a649ad72be582499967cedd73f008f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 12 Sep 2014 13:28:22 -0700 Subject: [PATCH] Ensure redis is on slaves (and running) Quite a few projects are/would like to use redis and being able to have their tests use the slave provided servers would be a great addition to ensure functionality is working as expected (when mocking just doesn't cut it). Change-Id: I6081b6cfe1c6393c7c6f2d028c313da759220a72 --- modules/openstack_project/manifests/jenkins_params.pp | 4 ++++ modules/openstack_project/manifests/thick_slave.pp | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 48a10f892f..56618f38c1 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -37,6 +37,8 @@ class openstack_project::jenkins_params { #$maven_package = 'maven' # For tooz unit tests $memcached_package = 'memcached' + # For tooz unit tests (and others that use redis) + $redis_package = 'redis' # For Ceilometer unit tests $mongodb_package = 'mongodb-server' $pandoc_package = 'pandoc' @@ -119,6 +121,8 @@ class openstack_project::jenkins_params { $maven_package = 'maven2' # For tooz unit tests $memcached_package = 'memcached' + # For tooz unit tests (and others that use redis) + $redis_package = 'redis-server' # For Ceilometer unit tests $mongodb_package = 'mongodb' $pandoc_package = 'pandoc' diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index 5e0ef1504e..b390ea3061 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -27,6 +27,7 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::libtidy_package, # for python-tidy, used by sphinxcontrib-docbookrestapi $::openstack_project::jenkins_params::libsasl_dev, # for keystone ldap auth integration $::openstack_project::jenkins_params::memcached_package, # for tooz unit tests + $::openstack_project::jenkins_params::redis_package, # for tooz unit tests (and others that use redis) $::openstack_project::jenkins_params::mongodb_package, # for ceilometer unit tests $::openstack_project::jenkins_params::mysql_dev_package, $::openstack_project::jenkins_params::nspr_dev_package, # for spidermonkey, used by ceilometer