opendev
/
puppet-jenkins
Code Issues Proposed changes

Use 'ruby' instead of 'ruby1.9.1' for Debian 

Use 'ruby' instead of 'ruby1.9.1' for Debian, since 'ruby1.9.1' is not
present in Debian starting from Jessie.
This fixes jenkins::slave on Debian hosts.

Change-Id: I4a5a8352388de46e9e7713fa11951fcde27eaad9
This commit is contained in:
Igor Belikov 2016-02-02 20:09:07 +03:00
parent 948560241a
commit 82b6cefbab
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/params.pp
View File

@ -39,8 +39,6 @@ class jenkins::params {
$ccache_package = 'ccache'
$python_netaddr_package = 'python-netaddr'
$maven_package = 'maven2'
$ruby1_9_1_package = 'ruby1.9.1'
$ruby1_9_1_dev_package = 'ruby1.9.1-dev'
$cgroups_package = 'cgroup-bin'
$cgroups_tools_package = ''
$cgconfig_require = [
@ -51,6 +49,16 @@ class jenkins::params {
Package['cgroups'],
File['/etc/init/cgred.conf'],
]
# ruby packages
# ruby1.9.1 is not present in Debian Jessie, use ruby instead
if ($::operatingsystem == 'Debian') {
$ruby_package = 'ruby'
$ruby_dev_package = 'ruby-dev'
}
else {
$ruby_package = 'ruby1.9.1'
$ruby_dev_package = 'ruby1.9.1-dev'
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")

4
manifests/slave.pp
View File

@ -66,11 +66,11 @@ class jenkins::slave(
require => Package[$::jenkins::params::jdk_package],
}
package { $::jenkins::params::ruby1_9_1_package:
package { $::jenkins::params::ruby_package:
ensure => present,
}
package { $::jenkins::params::ruby1_9_1_dev_package:
package { $::jenkins::params::ruby_dev_package:
ensure => present,
}