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 f12e19b638
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/master.pp
View File

@ -34,13 +34,29 @@ class jenkins::master(
include ::apt
include ::httpd
package { 'openjdk-7-jre-headless':
case $::osfamily {
'Debian': {
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
$jdk_package = 'openjdk-8-jre-headless'
$jdk_low_package = 'openjdk-7-jre-headless'
} else {
$jdk_package = 'openjdk-7-jre-headless'
$jdk_low_package = 'openjdk-6-jre-headless'
}
}
default: {
$jdk_package = 'openjdk-7-jre-headless'
$jdk_low_package = 'openjdk-6-jre-headless'
}
}
package { $jdk_package:
ensure => present,
}
package { 'openjdk-6-jre-headless':
package { $jdk_low_package:
ensure => purged,
require => Package['openjdk-7-jre-headless'],
require => Package[$jdk_package],
}
apt::source { 'jenkins':
@ -52,7 +68,7 @@ class jenkins::master(
'source' => 'http://pkg.jenkins.io/debian-stable/jenkins.io.key',
},
require => [
Package['openjdk-7-jre-headless'],
Package[$jdk_package],
],
include_src => false,
}