opendev/system-config
Code Issues Proposed changes

Conditionally install Python 3 development libs.

Browse Source 
* 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
This commit is contained in:
Jeremy Stanley 2013-07-22 06:02:25 +00:00
parent 84a692429e
commit 60e7d7086a
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,6 @@ class jenkins::params {
$python_libvirt_package = 'libvirt-python' $python_libvirt_package = 'libvirt-python'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
# FIXME: No Python3 packages on RHEL
#$python3_dev_package = 'python3-devel'
$rubygems_package = 'rubygems' $rubygems_package = 'rubygems'
# Common Lisp interpreter, used for cl-openstack-client # Common Lisp interpreter, used for cl-openstack-client
$sbcl_package = 'sbcl' $sbcl_package = 'sbcl'
@ -104,7 +102,6 @@ class jenkins::params {
$python_libvirt_package = 'python-libvirt' $python_libvirt_package = 'python-libvirt'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
$python3_dev_package = 'python3-all-dev'
$rubygems_package = 'rubygems' $rubygems_package = 'rubygems'
$ruby1_9_1_package = 'ruby1.9.1' $ruby1_9_1_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev' $ruby1_9_1_dev_package = 'ruby1.9.1-dev'

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

@ -93,12 +93,6 @@ class jenkins::slave(
require => Package[$::jenkins::params::jdk_package], 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: package { $::jenkins::params::ruby1_9_1_package:
ensure => present, ensure => present,
} }