opendev
/
puppet-jenkins
Code Issues Proposed changes

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>
This commit is contained in:
dongwenjuan 2017-05-02 17:59:02 +08:00
parent b507108750
commit 3f2c0a65aa
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/master.pp
View File

@ -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,
}

8
manifests/params.pp
View File

@ -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 = ''