Merge branch 'master' of https://github.com/rombert/puppetlabs-java into rombert-master

Conflicts: manifests/params.pp
2013-07-13 13:21:28 +10:00
parent 90485daa12 3ac6dd5966
commit e73f175f3a
3 changed files with 21 additions and 2 deletions
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -105,9 +105,20 @@ class java::params {
      }
    }
    'Suse': {
+      case $::operatingsystem {
+        default: {
+          $jdk_package = 'java-1_6_0-ibm-devel'
+          $jre_package = 'java-1_6_0-ibm'
+        }
+
+        'OpenSuSE': {
+          $jdk_package = 'java-1_7_0-openjdk-devel'
+          $jre_package = 'java-1_7_0-openjdk'
+        }
+      }
      $java = {
-        'jdk' => { 'package' => 'java-1_6_0-ibm-devel', },
-        'jre' => { 'package' => 'java-1_6_0-ibm', },
+        'jdk' => { 'package' => $jdk_package, },
+        'jre' => { 'package' => $jre_package, },
      }
    }
  }