bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject bigtop git commit: BIGTOP-2630: Fix issues introduced by BIGTOP-2614
Date Tue, 13 Dec 2016 18:32:22 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 16a888035 -> 3466b5f6e


BIGTOP-2630: Fix issues introduced by BIGTOP-2614


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3466b5f6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3466b5f6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3466b5f6

Branch: refs/heads/master
Commit: 3466b5f6e4883151f860f7f3341f6e501aa78fbe
Parents: 16a8880
Author: Olaf Flebbe <of@oflebbe.de>
Authored: Tue Dec 13 14:44:12 2016 +0100
Committer: Olaf Flebbe <of@oflebbe.de>
Committed: Tue Dec 13 19:32:02 2016 +0100

----------------------------------------------------------------------
 bigtop_toolchain/manifests/jdk.pp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/3466b5f6/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index 06090ad..e2cb2e7 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -14,13 +14,8 @@
 # limitations under the License.
 
 class bigtop_toolchain::jdk {
-  case "$::operatingsystem $::operatingsystemrelease" {
-    /(Fedora) 25/: {
-       package { 'java-1.8.0-openjdk-devel' :
-       ensure => present
-      }
-    }
-    Debian: {
+  case $operatingsystem {
+    /Debian/: {
       include apt
       include apt::backports
 
@@ -33,7 +28,7 @@ class bigtop_toolchain::jdk {
 
       Apt::Source['backports'] -> Exec['apt-update']
     }
-    Ubuntu: {
+    /Ubuntu/: {
       include apt
       
       package { 'openjdk-7-jdk' :
@@ -51,7 +46,7 @@ class bigtop_toolchain::jdk {
       
       Apt::Ppa['http://ppa.launchpad.net/openjdk-r/ppa/ubuntu'] -> Exec['apt-update']
     }
-    /(CentOS|Fedora|Amazon)/: {
+    /(CentOS|Amazon)/: {
       package { 'java-1.7.0-openjdk-devel' :
         ensure => present
       }
@@ -59,7 +54,17 @@ class bigtop_toolchain::jdk {
         ensure => present
       }
     }
-    /(OpenSuSE)/: {
+    /Fedora/: {
+      if 0 + $operatingsystemrelease < 21 {
+         package { 'java-1.7.0-openjdk-devel' :
+           ensure => present
+        }
+      }
+      package { 'java-1.8.0-openjdk-devel' :
+        ensure => present
+      }
+    }
+    /OpenSuSE/: {
       package { 'java-1_7_0-openjdk-devel' :
         ensure => present
       }


Mime
View raw message