You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/12/20 19:43:25 UTC
svn commit: r1221422 - in /incubator/ambari/trunk:
agent/src/main/resources/puppet/manifests/site.pp
controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json
Author: vgogate
Date: Tue Dec 20 18:43:24 2011
New Revision: 1221422
URL: http://svn.apache.org/viewvc?rev=1221422&view=rev
Log:
AMBARI-161. Add puppet module for Hadoop to agent resources
Modified:
incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp
incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json
Modified: incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp?rev=1221422&r1=1221421&r2=1221422&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp (original)
+++ incubator/ambari/trunk/agent/src/main/resources/puppet/manifests/site.pp Tue Dec 20 18:43:24 2011
@@ -83,6 +83,15 @@ node default {
auth_type => "simple"
}
}
+
+ if ($fqdn in $role_to_nodes[client]) {
+ hadoop::client {"client":
+ ambari_role_name => "client",
+ ambari_role_prefix => "${stack_path}/client",
+ user => $ambari_hdfs_user,
+ group => $ambari_admin_group
+ }
+ }
}
Yumrepo<||> -> Package<||>
Modified: incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json?rev=1221422&r1=1221421&r2=1221422&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json (original)
+++ incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json Tue Dec 20 18:43:24 2011
@@ -162,7 +162,7 @@
},
{
"@name":"HADOOP_CONF_DIR",
- "@value":"<%= ambari_role_prefix %>/etc/hadoop"
+ "@value":"<%= ambari_role_prefix %>/etc/conf"
},
{
"@name":"HADOOP_OPTS",
@@ -300,6 +300,10 @@
"@name":"hadoop-env.sh",
"property":[
{
+ "@name":"HADOOP_CONF_DIR",
+ "@value":"<%= ambari_role_prefix %>/etc/hadoop"
+ },
+ {
"@name":"HADOOP_NAMENODE_OPTS",
"@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT"
},