Author: ncole
Date: Tue Jun 4 11:59:01 2013
New Revision: 1489393
URL: http://svn.apache.org/r1489393
Log:
AMBARI-2248. Fix to not rely on specific stack version
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1489393&r1=1489392&r2=1489393&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Tue Jun 4 11:59:01 2013
@@ -302,8 +302,10 @@ class hdp::params()
if (hdp_get_major_stack_version($stack_version) >= 2) {
$hadoop_bin = "/usr/lib/hadoop/sbin"
+ $hadoop_deps = ['hadoop','hadoop-libhdfs','hadoop-lzo',
'hadoop-lzo-native']
} else {
$hadoop_bin = "/usr/lib/hadoop/bin"
+ $hadoop_deps =
['hadoop','hadoop-libhdfs','hadoop-native','hadoop-pipes','hadoop-sbin','hadoop-lzo',
'hadoop-lzo-native']
}
$yarn_bin = "/usr/lib/hadoop-yarn/sbin"
$mapred_bin = "/usr/lib/hadoop-mapreduce/sbin"
@@ -353,7 +355,7 @@ class hdp::params()
suse => 'htpasswd2'}
}
-
+
# StackId => Arch => Os
$package_names =
{
@@ -388,17 +390,7 @@ class hdp::params()
'ALL' =>
['hadoop','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386','hadoop-lzo',
'hadoop-lzo-native.i386']
},
64 => {
- 'ALL' =>
['hadoop','hadoop-libhdfs','hadoop-native','hadoop-pipes','hadoop-sbin','hadoop-lzo',
'hadoop-lzo-native']
- }
- },
- '2.0.1' => {
- 64 => {
- 'ALL' => ['hadoop','hadoop-libhdfs','hadoop-lzo',
'hadoop-lzo-native']
- }
- },
- '2.0.3' => {
- 64 => {
- 'ALL' => ['hadoop','hadoop-libhdfs','hadoop-lzo',
'hadoop-lzo-native']
+ 'ALL' => $hadoop_deps
}
}
},
