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