You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/06/27 00:28:01 UTC
svn commit: r1354275 - in /incubator/ambari/trunk: CHANGES.txt
hmc/puppet/modules/hdp/manifests/init.pp
hmc/puppet/modules/hdp/manifests/params.pp
Author: hitesh
Date: Tue Jun 26 22:28:00 2012
New Revision: 1354275
URL: http://svn.apache.org/viewvc?rev=1354275&view=rev
Log:
AMBARI-546. Puppet fails to install 32-bit JDK properly on RHEL6 (Contributed by Hitesh)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/init.pp
incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1354275&r1=1354274&r2=1354275&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jun 26 22:28:00 2012
@@ -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
Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/init.pp?rev=1354275&r1=1354274&r2=1354275&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/init.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/init.pp Tue Jun 26 22:28:00 2012
@@ -48,6 +48,17 @@ class hdp(
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
Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp?rev=1354275&r1=1354274&r2=1354275&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp Tue Jun 26 22:28:00 2012
@@ -26,6 +26,25 @@ class hdp::params()
$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 @@ class hdp::params()
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'
},