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

Merge pull request #322 from syseleven/MODULES-8025

Browse Source 
(MODULES-8025) Switch default for Ubuntu 18.04 to 11
This commit is contained in:
david22swan
2018-10-12 11:50:36 +01:00
committed by GitHub
parent 615db5f7c6 60c93866b1
commit c6acb9906c
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 = {
'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}") }
}
}