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

cosmetic: default in last position

Browse Source 
The main motivation for this change is for compatibility with puppetresource (https://github.com/bartavelle/language-puppet).

IMHO, it makes much more sense this way because all cases are checked order wise.
This commit is contained in:
Pi3r
2014-09-01 13:53:08 +02:00
parent db0f428a66
commit 7580a25018
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -13,10 +13,8 @@
class java::params { class java::params {
case $::osfamily { case $::osfamily {
default: { fail("unsupported platform ${::osfamily}") }
'RedHat': { 'RedHat': {
case $::operatingsystem { case $::operatingsystem {
default: { fail("unsupported os ${::operatingsystem}") }
'RedHat', 'CentOS', 'OracleLinux', 'Scientific': { 'RedHat', 'CentOS', 'OracleLinux', 'Scientific': {
if (versioncmp($::operatingsystemrelease, '5.0') < 0) { if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
$jdk_package = 'java-1.6.0-sun-devel' $jdk_package = 'java-1.6.0-sun-devel'
@@ -39,6 +37,7 @@ class java::params {
$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: { fail("unsupported os ${::operatingsystem}") }
} }
$java = { $java = {
'jdk' => { 'package' => $jdk_package, }, 'jdk' => { 'package' => $jdk_package, },
@@ -129,5 +128,6 @@ class java::params {
'jre' => { 'package' => $jre_package, }, 'jre' => { 'package' => $jre_package, },
} }
} }
default: { fail("unsupported platform ${::osfamily}") }
} }
} }