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/07/06 00:10:01 UTC
svn commit: r1357967 - in /incubator/ambari/trunk: CHANGES.txt
hmc/puppet/modules/hdp/manifests/lzo/package.pp
hmc/puppet/modules/hdp/manifests/params.pp
Author: hitesh
Date: Thu Jul 5 22:10:00 2012
New Revision: 1357967
URL: http://svn.apache.org/viewvc?rev=1357967&view=rev
Log:
AMBARI-600. Fix lzo installs to work correctly on RHEL6 (Contributed by Hitesh)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/lzo/package.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=1357967&r1=1357966&r2=1357967&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jul 5 22:10:00 2012
@@ -6,6 +6,8 @@ characters wide.
Release 1.0.0 - unreleased
+ AMBARI-600. Fix lzo installs to work correctly on RHEL6 (hitesh)
+
AMBARI-598. Set state to UNKNOWN and not 0 to avoid issues when using === matches
(hitesh)
Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/lzo/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/lzo/package.pp?rev=1357967&r1=1357966&r2=1357967&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/lzo/package.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/lzo/package.pp Thu Jul 5 22:10:00 2012
@@ -21,8 +21,18 @@
define hdp::lzo::package()
{
$size = $name
+
+ case $hdp::params::hdp_os_type {
+ centos6, rhel6: {
+ $pkg_type = 'lzo-rhel6'
+ }
+ default: {
+ $pkg_type = 'lzo-rhel5'
+ }
+ }
+
hdp::package {"lzo ${size}":
- package_type => 'lzo',
+ package_type => "${pkg_type}",
size => $size,
java_needed => false
}
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=1357967&r1=1357966&r2=1357967&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp Thu Jul 5 22:10:00 2012
@@ -246,10 +246,14 @@ class hdp::params()
oozie-server => {
64 => 'oozie.noarch'
},
- lzo => {
+ lzo-rhel5 => {
32 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386'],
64 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386']
},
+ lzo-rhel6 => {
+ 32 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686'],
+ 64 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686']
+ },
#TODO: make these two consistent on whether case of 64/32 bits
snappy => {
32 => ['snappy','snappy-devel'],