From 60e7d7086ae4dbbbb4fdf7b492909f76397ab34e Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 22 Jul 2013 06:02:25 +0000 Subject: [PATCH] Conditionally install Python 3 development libs. * modules/jenkins/manifests/params.pp * modules/jenkins/manifests/slave.pp: The conditional check introduced in the Jenkins slave manifest in commit 3c7af7d was only a half-fix since the python3 pip provider lacked a similar check, so depending on the order in which it's puppeted the conflict could still arise. Since this package is not needed on non-py3k slaves, we can just remove it from the slave manifest and expect slaves which do need it to get it from the pip puppet module instead. Change-Id: If22aaa1319b61aa58306036a03843fa0cc79b34c --- modules/jenkins/manifests/params.pp | 3 --- modules/jenkins/manifests/slave.pp | 6 ------ 2 files changed, 9 deletions(-) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index ba9a4996f2..de2c40c190 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -42,8 +42,6 @@ class jenkins::params { $python_libvirt_package = 'libvirt-python' $python_lxml_package = 'python-lxml' $python_zmq_package = 'python-zmq' - # FIXME: No Python3 packages on RHEL - #$python3_dev_package = 'python3-devel' $rubygems_package = 'rubygems' # Common Lisp interpreter, used for cl-openstack-client $sbcl_package = 'sbcl' @@ -104,7 +102,6 @@ class jenkins::params { $python_libvirt_package = 'python-libvirt' $python_lxml_package = 'python-lxml' $python_zmq_package = 'python-zmq' - $python3_dev_package = 'python3-all-dev' $rubygems_package = 'rubygems' $ruby1_9_1_package = 'ruby1.9.1' $ruby1_9_1_dev_package = 'ruby1.9.1-dev' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 74e75f4efd..77e0e6108a 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -93,12 +93,6 @@ class jenkins::slave( require => Package[$::jenkins::params::jdk_package], } - if ! defined(Package[$::jenkins::params::python3_dev_package]) { - package { $::jenkins::params::python3_dev_package: - ensure => present, - } - } - package { $::jenkins::params::ruby1_9_1_package: ensure => present, }