AMBARI-546. Puppet fails to install 32-bit JDK properly on RHEL6 (Con…

…tributed by Hitesh) git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1354275 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 26, 2012 · 982404b · 982404b
1 parent ca56976
commit 982404b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,8 @@ characters wide.
 
 Release 1.0.0 - unreleased
 
+  AMBARI-546. Puppet fails to install 32-bit JDK properly on RHEL6 (hitesh)
+
   AMBARI-548. Puppet agent install script should use correct epel repo (hitesh)
 
   AMBARI-547. Change os type check during node bootstrap to allow for

diff --git a/hmc/puppet/modules/hdp/manifests/init.pp b/hmc/puppet/modules/hdp/manifests/init.pp
@@ -48,6 +48,17 @@
     ensure => stopped,
   }
 
+  case $hdp::params::hdp_os_type {
+    centos6, rhel6: {
+      hdp::package{ 'glibc-rhel6':
+        ensure       => 'present',
+        size         => $size,
+        java_needed  => false,
+        lzo_needed   => false
+      }
+    }
+  }
+
 }
 
 class hdp::pre_install_pkgs

diff --git a/hmc/puppet/modules/hdp/manifests/params.pp b/hmc/puppet/modules/hdp/manifests/params.pp
@@ -26,6 +26,25 @@
 
   $dashboard_host = hdp_default("dashboard_host")
 
+  $hdp_os = $::operatingsystem
+  $hdp_os_version = $::operatingsystemrelease
+  case $::operatingsystem {
+    centos: {
+      case $::operatingsystemrelease {
+        /^5\..+$/: { $hdp_os_type = "centos5" }
+        /^6\..+$/: { $hdp_os_type = "centos6" }
+      }
+    }
+    redhat: {
+      case $::operatingsystemrelease {
+        /^5\..+$/: { $hdp_os_type = "rhel5" }
+        /^6\..+$/: { $hdp_os_type = "rhel6" }
+      }
+    }
+    default: {
+      hdp_fail("No support for os  ${hdp_os} ${hdp_os_version}")
+    }
+  }
 
   if ($hostAttributes != undef) {
     $public_namenode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$namenode_host)
@@ -170,6 +189,10 @@
     ganglia-hdp-gweb-addons => {
       64 => 'hdp_mon_ganglia_addons'
     },
+    glibc-rhel6 => {
+      32 => ['glibc','glibc.i686'],
+      64 => ['glibc','glibc.i686']
+    },
     nagios-addons => {
       64 => 'hdp_mon_nagios_addons'
     },