opendev/system-config
Code Issues Proposed changes

Merge "Conditionally install Python 3 development libs."

Browse Source
This commit is contained in:
Jenkins 2013-07-29 16:18:12 +00:00 committed by Gerrit Code Review
commit 75e2eec220
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,
} }