From 5007be2226e7e4cfd8b541c9b8e9d67af74e7335 Mon Sep 17 00:00:00 2001 From: Gareth Rushgrove Date: Tue, 2 Apr 2013 16:08:14 +0100 Subject: [PATCH] get correct jdk version for centos 5.8 and 6.3 --- manifests/init.pp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 40363d5..363a7c0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,7 +10,6 @@ # # Sample Usage: # -# [Remember: No empty lines between comments and class definition] class java( $distribution = 'jdk', $version = 'present' @@ -26,20 +25,23 @@ class java( 'RedHat': { - if ($operatingsystem == 'Fedora') { - class { 'java::package_redhat': - version => $version, - distribution => 'java', - require => Anchor['java::begin'], - before => Anchor['java::end'], + if ($::operatingsystem == 'Fedora') { + $distribution_redhat = 'java' + } elsif ($::operatingsystem == 'Centos') { + case $::operatingsystemrelease { + '5.8': { $distribution_redhat = 'java-1.7.0-openjdk' } + '6.3': { $distribution_redhat = 'java-1.7.0-openjdk' } + default: { $distribution_redhat = $distribution } } } else { - class { 'java::package_redhat': - version => $version, - distribution => $distribution, - require => Anchor['java::begin'], - before => Anchor['java::end'], - } + $distribution_redhat = $distribution + } + + class { 'java::package_redhat': + version => $version, + distribution => $distribution_redhat, + require => Anchor['java::begin'], + before => Anchor['java::end'], } }