From 56902db331f4a8e1a5c555f05c8d97735b565060 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 3 Jan 2013 13:40:14 -0500 Subject: [PATCH] Update jenkins::slave manifest to support Red Hat. Adds a new jenkins::params module where we set parameters based on the operating system name. Updates the jenkins::slave module so that it makes use of distro specific parameters via jenkins::params. In general almost all of the previously installed packages are installed in the same fashion via the new param files. The following special cases are handled via inline conditionals in the jenkins::slave manifest: 1) Ubuntu installs the 'build-essential' meta package. Since other distros don't necissarily have an equivilant package name we have to do this manually. On RHEL we yum install the 'Development tools' package group in a similar fashion. 2) There aren't currently RHEL packages for maven and python3. I think this is probably Okay since our initial target for RHEL in openstack-ci is to be able to run unit tests which shouldn't require these. 3) Lastly we exclude the sysctl.d ptrace.conf on RHEL since it doesn't currently support sysctl conf.d directory files. This is probably Okay as well since the initial target for this file was temporary and only to help debug a Glance unit test failure. Change-Id: Ic46bc63ade3aab54a4381ca0c99fa03ac9dd59e2 Reviewed-on: https://review.openstack.org/18906 Reviewed-by: Clark Boylan Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins/manifests/params.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index e17b45f415..3d684d819c 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -20,6 +20,8 @@ class jenkins::params { $mod_wsgi_package = 'mod_wsgi' $libcurl_dev_package = 'libcurl-devel' $ldap_dev_package = 'openldap-devel' + # for keystone ldap auth integration + $libsasl_dev = 'cyrus-sasl-devel' $mysql_dev_package = 'mysql-devel' $nspr_dev_package = 'nspr-devel' $sqlite_dev_package = 'sqlite-devel' @@ -56,6 +58,8 @@ class jenkins::params { $mod_wsgi_package = 'libapache2-mod-wsgi' $libcurl_dev_package = 'libcurl4-gnutls-dev' $ldap_dev_package = 'libldap2-dev' + # for keystone ldap auth integration + $libsasl_dev = 'libsasl2-dev' $mysql_dev_package = 'libmysqlclient-dev' $nspr_dev_package = 'libnspr4-dev' $sqlite_dev_package = 'libsqlite3-dev'