From 3f2c0a65aa83d82070f9326eed9fad8d0eb0d869 Mon Sep 17 00:00:00 2001
From: dongwenjuan <dong.wenjuan@zte.com.cn>
Date: Tue, 2 May 2017 17:59:02 +0800
Subject: [PATCH] use 'openjdk-8-jre-headless' for ubuntu-16.04

Use 'puppet apply' to install jenkins in ubuntu-16.04 failed.
Need to upgrade the 'openjdk-8-jre-headless' package.
See https://github.com/rvm/rvm/issues/3719

Change-Id: If31abd1d29416dbb567c0f76529913b8327d40c1
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
---
 manifests/master.pp | 10 +++++-----
 manifests/params.pp |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/manifests/master.pp b/manifests/master.pp
index b5f0ef1..c5da80e 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -33,14 +33,14 @@ class jenkins::master(
   include ::pip
   include ::apt
   include ::httpd
+  include ::jenkins::params
 
-  package { 'openjdk-7-jre-headless':
+  package { $::jenkins::params::jre_package:
     ensure => present,
   }
-
-  package { 'openjdk-6-jre-headless':
+  package { $::jenkins::params::jre_low_package:
     ensure  => purged,
-    require => Package['openjdk-7-jre-headless'],
+    require => Package[$::jenkins::params::jre_package],
   }
 
   apt::source { 'jenkins':
@@ -52,7 +52,7 @@ class jenkins::master(
       'source' => 'http://pkg.jenkins.io/debian-stable/jenkins.io.key',
     },
     require     => [
-      Package['openjdk-7-jre-headless'],
+      Package[$::jenkins::params::jre_package],
     ],
     include_src => false,
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index 558cf90..d7293e9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -32,6 +32,8 @@ class jenkins::params {
         $cgconfig_require = Package['cgroups']
         $cgred_require = Package['cgroups']
       }
+      $jre_package = 'openjdk-7-jre-headless'
+      $jre_low_package = 'openjdk-6-jre-headless'
     }
     'Suse': {
       $jdk_package = 'java-1_8_0-openjdk-devel'
@@ -45,6 +47,8 @@ class jenkins::params {
       $cgred_require = [
         Package['libcgroup-tools']
       ]
+      $jre_package = 'openjdk-7-jre-headless'
+      $jre_low_package = 'openjdk-6-jre-headless'
     }
     'Debian': {
       # common packages
@@ -53,9 +57,13 @@ class jenkins::params {
       if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
         $jdk_package = 'openjdk-8-jdk'
         $maven_package = 'maven'
+        $jre_package = 'openjdk-8-jre-headless'
+        $jre_low_package = 'openjdk-7-jre-headless'
       } else {
         $jdk_package = 'openjdk-7-jdk'
         $maven_package = 'maven2'
+        $jre_package = 'openjdk-7-jre-headless'
+        $jre_low_package = 'openjdk-6-jre-headless'
       }
       $cgroups_package = 'cgroup-bin'
       $cgroups_tools_package = ''