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

re-orders case statements in manifests to workaround PUP-4520.

Browse Source
This commit is contained in:
Bryan Jen
2015-06-24 13:49:19 -07:00
parent a5500ff58e
commit bfc03a54c5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/params.pp
View File

@@ -52,7 +52,6 @@ class java::params {
} }
'Debian': { 'Debian': {
case $::lsbdistcodename { case $::lsbdistcodename {
default: { fail("unsupported release ${::lsbdistcodename}") }
'lenny', 'squeeze', 'lucid', 'natty': { 'lenny', 'squeeze', 'lucid', 'natty': {
$java = { $java = {
'jdk' => { 'jdk' => {
@@ -125,6 +124,7 @@ class java::params {
} }
} }
} }
default: { fail("unsupported release ${::lsbdistcodename}") }
} }
} }
'OpenBSD': { 'OpenBSD': {
@@ -141,11 +141,6 @@ class java::params {
} }
'Suse': { 'Suse': {
case $::operatingsystem { case $::operatingsystem {
default: {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'
}
'SLES': { 'SLES': {
case $::operatingsystemmajrelease{ case $::operatingsystemmajrelease{
default: { default: {
@@ -158,11 +153,14 @@ class java::params {
} }
} }
} }
'OpenSuSE': { 'OpenSuSE': {
$jdk_package = 'java-1_7_0-openjdk-devel' $jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk' $jre_package = 'java-1_7_0-openjdk'
} }
default: {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'
}
} }
$java = { $java = {
'jdk' => { 'package' => $jdk_package, }, 'jdk' => { 'package' => $jdk_package, },