From 82b6cefbab0595cbb5adfa163c14e62fc0dbd7b0 Mon Sep 17 00:00:00 2001
From: Igor Belikov <ibelikov@mirantis.com>
Date: Tue, 2 Feb 2016 20:09:07 +0300
Subject: [PATCH] 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
---
 manifests/params.pp | 12 ++++++++++--
 manifests/slave.pp  |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e5a411c..323c9ff 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -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).")
diff --git a/manifests/slave.pp b/manifests/slave.pp
index 9309df3..4556e7e 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -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,
       }