RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

(MODULES-8025) Switch default for Ubuntu 18.04 to 11

Browse Source 
This is needed to get the default Java version rollout with Ubuntu
18.04.
This commit is contained in:
Matthias Baur
2018-10-01 18:07:32 +02:00
parent 72e042afad
commit 60c93866b1
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/params.pp
View File

@@ -155,7 +155,7 @@ class java::params {
}, },
} }
} }
'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful', 'bionic': { 'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful': {
$java = { $java = {
'jdk' => { 'jdk' => {
'package' => 'openjdk-8-jdk', 'package' => 'openjdk-8-jdk',
@@ -171,6 +171,22 @@ class java::params {
} }
} }
} }
'bionic': {
$java = {
'jdk' => {
'package' => 'openjdk-11-jdk',
'alternative' => "java-1.11.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${::architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${::architecture}/",
},
'jre' => {
'package' => 'openjdk-11-jre-headless',
'alternative' => "java-1.11.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${::architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${::architecture}/",
}
}
}
default: { fail("unsupported release ${::lsbdistcodename}") } default: { fail("unsupported release ${::lsbdistcodename}") }
} }
} }