incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgog...@apache.org
Subject svn commit: r1208310 - /incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml
Date Wed, 30 Nov 2011 07:24:56 GMT
Author: vgogate
Date: Wed Nov 30 07:24:55 2011
New Revision: 1208310

URL: http://svn.apache.org/viewvc?rev=1208310&view=rev
Log:
AMBARI-144

Modified:
    incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml

Modified: incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml?rev=1208310&r1=1208309&r2=1208310&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml
(original)
+++ incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.xml
Wed Nov 30 07:24:55 2011
@@ -6,6 +6,9 @@
     <configuration>
         <category name="ambari">
             <property name="ambari.cluster.name" value="IMPLICIT" />   
+            <property name="ambari.role.name" value="IMPLICIT" />   
+            <property name="ambari.mapred.jobtracker.host" value="IMPLICIT" />   
+
             <property name="ambari.namenode.principal" value="nn" />
             <property name="ambari.datanode.principal" value="dn" />
             <property name="ambari.jobtracker.principal" value="jt" />
@@ -23,10 +26,10 @@
             <property name="ambari.data.prefix" value="ambari" />
             <property name="ambari.cluster.prefix" value="ambari" />   
 
-            <property name="ambari.service.realm" value="${ambari.user.realm}" /> 

-            <property name="ambari.service.realm" value="\${local.realm}" /> 
+            <property name="ambari.user.realm" value="EXAMPLE.KERBEROS.COM" />  
+            <property name="ambari.service.realm" value="EXAMPLE.KERBEROS.COM" /> 
             <property name="ambari.webauthfilter" value="org.apache.hadoop.http.lib.StaticUserWebFilter"/>
-            <property name="ambari.hadoop_conf_dir" value="/etc/hadoop"/>
+            <property name="ambari.hadoop_conf_dir" value="/etc/hadoop/conf"/>
         </category>
     </configuration>
     <components name="common" architecture="x86_64" version="0.20.205.0" provider="org.apache.hadoop">
@@ -37,12 +40,12 @@
         <roles name="namenode">
           <configuration>
             <category name="mapred-site">
-                <property name="mapred.tasktracker.tasks.sleeptime-before-sigkill" value="250"
/>
                 <property name="*mapred.system.dir" value="/mapred/mapredsystem" />
 
-                <property name="*mapred.job.tracker" value="${ambari.mapred.jobtracker.host}:9000"
/>
-                <property name="*mapred.job.tracker.http.address" value="${ambari.mapred.jobtracker.host}:50030"
/>
-                <property name="*mapred.local.dir" value="${ambari.cluster.prefix}/lib/hadoop/mapred,${ambari.cluster.prefix}/lib/hadoop/mapred"
/> 
-                <property name="mapreduce.cluster.administrators" value="${ambari.mapreduce.user}"
/>
+                <property name="*mapred.local.dir" value="/var/lib/hadoop/mapred1,/var/lib/hadoop/mapred2"
/> 
+                <property name="mapred.tasktracker.tasks.sleeptime-before-sigkill" value="250"
/>
+                <property name="*mapred.job.tracker" value="<%= ambari.mapred.jobtracker.host
%>:9000" />
+                <property name="*mapred.job.tracker.http.address" value="<%= ambari.mapred.jobtracker.host
%>:50030" />
+                <property name="mapreduce.cluster.administrators" value="<%= ambari.mapreduce.user
%>" />
                 <property name="mapred.map.tasks.speculative.execution" value="false"
/>
                 <property name="mapred.reduce.tasks.speculative.execution" value="false"
/>
                 <property name="mapred.output.compression.type" value="BLOCK" />
@@ -52,38 +55,38 @@
                 <property name="mapred.child.java.opts" value="-server -Xmx640m -Djava.net.preferIPv4Stack=true"
/>
                 <property name="mapred.child.ulimit" value="8388608" />
                 <property name="mapred.job.tracker.persist.jobstatus.active" value="true"
/>
-                <property name="mapred.job.tracker.persist.jobstatus.dir" value="file:////var/mount1/log/hadoop/${ambari.mapreduce.user}/jobstatus"
/> 
+                <property name="mapred.job.tracker.persist.jobstatus.dir" value="file:////var/log/hadoop/<%=
ambari.mapreduce.user %>/jobstatus" /> 
                 <property name="mapred.job.tracker.history.completed.location" value="/mapred/history/done"
/> 
                 <property name="mapred.heartbeats.in.second" value="200" />
                 <property name="mapreduce.tasktracker.outofband.heartbeat" value="true"
/>
                 <property name="*mapred.jobtracker.maxtasks.per.job" value="200000" />
-                <property name="mapreduce.jobtracker.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="mapreduce.tasktracker.kerberos.principal" value="${ambari.tasktracker.principal}/_HOST@${ambari.service.realm}"
/>
+                <property name="mapreduce.jobtracker.kerberos.principal" value="<%=
ambari.jobtracker.principal %>/_HOST@<%= ambari.service.realm %>" />
+                <property name="mapreduce.tasktracker.kerberos.principal" value="<%=
ambari.tasktracker.principal %>/_HOST@<%= ambari.service.realm %>" />
                 <property name="hadoop.job.history.user.location" value="none" />
-                <property name="mapreduce.jobtracker.keytab.file" value="/etc/security/keytabs/${ambari.jobtracker.principal}.service.keytab"
/>    
-                <property name="mapreduce.tasktracker.keytab.file" value="/etc/security/keytabs/${ambari.tasktracker.principal}.service.keytab"
/>  
+                <property name="mapreduce.jobtracker.keytab.file" value="/etc/security/keytabs/<%=
ambari.jobtracker.principal %>.service.keytab" />    
+                <property name="mapreduce.tasktracker.keytab.file" value="/etc/security/keytabs/<%=
ambari.tasktracker.principal %>.service.keytab" />  
                 <property name="mapreduce.jobtracker.staging.root.dir" value="/user" />
                 <property name="mapreduce.job.acl-modify-job" value="" />
                 <property name="mapreduce.job.acl-view-job" value="Dr.Who" />
-                <property name="mapreduce.tasktracker.group" value="${ambari.admin.group}"
/>
+                <property name="mapreduce.tasktracker.group" value="<%= ambari.admin.group
%>" />
                 <property name="mapred.acls.enabled" value="true" />
                 <property name="mapred.jobtracker.taskScheduler" value="org.apache.hadoop.mapred.CapacityTaskScheduler"
/>
                 <property name="mapred.queue.names" value="default" />
                 <property name="mapreduce.history.server.embedded" value="false" />
-                <property name="mapreduce.history.server.http.address" value="${ambari.mapred.jobtracker.host}:51111"
/>
-                <property name="mapreduce.jobhistory.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="mapreduce.jobhistory.keytab.file" value="/etc/security/keytabs/${ambari.jobtracker.principal}.service.keytab"
/>
-                <property name="mapred.hosts" value="${ambari.HADOOP_CONF_DIR}/mapred.include"
/>
-                <property name="mapred.hosts.exclude" value="${ambari.HADOOP_CONF_DIR}/mapred.exclude"
/>
+                <property name="mapreduce.history.server.http.address" value="<%= ambari.mapred.jobtracker.host
%>:51111" />
+                <property name="mapreduce.jobhistory.kerberos.principal" value="<%=
ambari.jobtracker.principal %>/_HOST@<%= ambari.service.realm %>" />
+                <property name="mapreduce.jobhistory.keytab.file" value="/etc/security/keytabs/<%=
ambari.jobtracker.principal %>.service.keytab" />
+                <property name="mapred.hosts" value="<%= ambari.hadoop_conf_dir %>/<%=
ambari.cluster.name %>-<%= ambari.role.name %>/mapred.include" />
+                <property name="mapred.hosts.exclude" value="<%= ambari.hadoop_conf_dir
%>/<%= ambari.cluster.name %>-<%= ambari.role.name %>/mapred.exclude" />
                 <property name="mapred.jobtracker.retirejob.check" value="10000" />
                 <property name="mapred.jobtracker.retirejob.interval" value="0" />
             </category>
 
             <category name="core-site">
-                <property name="local.realm" value="KERBEROS.EXAMPLE.COM" /> 
+                <property name="local.realm" value=<%= ambari.service.realm %> />

                 <property name="fs.default.name" value="hdfs://${ambari.hdfs.namenode.host}:8020"
/>
                 <property name="fs.trash.interval" value="360" />
-                <property name="hadoop.security.auth_to_local" value="RULE:[1:$1@$0](.*@${ambari.user.realm})s/@.*//
RULE:[2:$1@$0](${ambari.jobtracker.principal}@${ambari.service.realm})s/.*/${ambari.mapreduce.user}/
RULE:[2:$1@$0](${ambari.tasktracer.principal}@${ambari.service.realm})s/.*/${ambari.mapreduce.user}/
RULE:[2:$1@$0](${ambari.namenode.principal}@${ambari.service.realm})s/.*/${ambari.hdfs.user}/
RULE:[2:$1@$0](${ambari.datanode.principal}@${ambari.service.realm})s/.*/${ambari.hdfs.user}/
RULE:[2:$1@$0](${ambari.hbasemaster.principal}@${ambari.service.realm})s/.*/${ambari.hbase.user}/
RULE:[2:$1@$0](${ambari.regionserver.principal}@${ambari.service.realm})s/.*/${ambari.hbase.user}/
RULE:[2:$1@$0](${ambari.hcat.principal}@${ambari.service.realm})s/.*/${ambari.hcat.user}/"
/>
+                <property name="hadoop.security.auth_to_local" value="RULE:[1:$1@$0](.*@<%=
ambari.user.realm %>)s/@.*// RULE:[2:$1@$0](${ambari.jobtracker.principal}@<%= ambari.service.realm
%>)s/.*/${ambari.mapreduce.user}/ RULE:[2:$1@$0](${ambari.tasktracer.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.mapreduce.user}/ RULE:[2:$1@$0](${ambari.namenode.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hdfs.user}/ RULE:[2:$1@$0](${ambari.datanode.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hdfs.user}/ RULE:[2:$1@$0](${ambari.hbasemaster.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hbase.user}/ RULE:[2:$1@$0](${ambari.regionserver.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hbase.user}/ RULE:[2:$1@$0](${ambari.hcat.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hcat.user}/" />
                 <property name="hadoop.security.authentication" value="simple" />
                 <property name="hadoop.security.authorization" value="false" />
                 <property name="hadoop.security.groups.cache.secs" value="14400" />
@@ -101,12 +104,12 @@
                 <property name="dfs.umaskmode" value="077" />
 
                 <property name="dfs.block.access.token.enable" value="false" />
-                <property name="dfs.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.namenode.kerberos.https.principal" value="host/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.secondary.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.secondary.namenode.kerberos.https.principal" value="host/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.datanode.kerberos.principal" value="${ambari.datanode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.web.authentication.kerberos.principal" value="HTTP/_HOST@${ambari.service.realm}"
/>
+                <property name="dfs.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.namenode.kerberos.https.principal" value="host/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.secondary.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.secondary.namenode.kerberos.https.principal" value="host/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.datanode.kerberos.principal" value="${ambari.datanode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.web.authentication.kerberos.principal" value="HTTP/_HOST@<%=
ambari.service.realm %>" />
 
                 <property name="dfs.web.authentication.kerberos.keytab" value="/etc/security/keytabs/${ambari.namenode.principal}.service.keytab"
/>
                 <property name="dfs.namenode.keytab.file" value="/etc/security/keytabs/${ambari.namenode.principal}.service.keytab"
/>
@@ -170,8 +173,8 @@
                 <property name="mapred.heartbeats.in.second" value="200" />
                 <property name="mapreduce.tasktracker.outofband.heartbeat" value="true"
/>
                 <property name="*mapred.jobtracker.maxtasks.per.job" value="200000" />
-                <property name="mapreduce.jobtracker.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="mapreduce.tasktracker.kerberos.principal" value="${ambari.tasktracker.principal}/_HOST@${ambari.service.realm}"
/>
+                <property name="mapreduce.jobtracker.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="mapreduce.tasktracker.kerberos.principal" value="${ambari.tasktracker.principal}/_HOST@<%=
ambari.service.realm %>" />
                 <property name="hadoop.job.history.user.location" value="none" />
                 <property name="mapreduce.jobtracker.keytab.file" value="/etc/security/keytabs/${ambari.jobtracker.principal}.service.keytab"
/>    
                 <property name="mapreduce.tasktracker.keytab.file" value="/etc/security/keytabs/${ambari.tasktracker.principal}.service.keytab"
/>  
@@ -184,7 +187,7 @@
                 <property name="mapred.queue.names" value="default" />
                 <property name="mapreduce.history.server.embedded" value="false" />
                 <property name="mapreduce.history.server.http.address" value="${ambari.mapred.jobtracker.host}:51111"
/>
-                <property name="mapreduce.jobhistory.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@${ambari.service.realm}"
/>
+                <property name="mapreduce.jobhistory.kerberos.principal" value="${ambari.jobtracker.principal}/_HOST@<%=
ambari.service.realm %>" />
                 <property name="mapreduce.jobhistory.keytab.file" value="/etc/security/keytabs/${ambari.jobtracker.principal}.service.keytab"
/>
                 <property name="mapred.hosts" value="${ambari.HADOOP_CONF_DIR}/mapred.include"
/>
                 <property name="mapred.hosts.exclude" value="${ambari.HADOOP_CONF_DIR}/mapred.exclude"
/>
@@ -193,10 +196,10 @@
             </category>
 
             <category name="core-site">
-                <property name="local.realm" value="KERBEROS.EXAMPLE.COM" /> 
+                <property name="local.realm" value=<%= ambari.service.realm %> />

                 <property name="fs.default.name" value="hdfs://${ambari.hdfs.namenode.host}:8020"
/>
                 <property name="fs.trash.interval" value="360" />
-                <property name="hadoop.security.auth_to_local" value="RULE:[1:$1@$0](.*@${ambari.user.realm})s/@.*//
RULE:[2:$1@$0](${ambari.jobtracker.principal}@${ambari.service.realm})s/.*/${ambari.mapreduce.user}/
RULE:[2:$1@$0](${ambari.tasktracer.principal}@${ambari.service.realm})s/.*/${ambari.mapreduce.user}/
RULE:[2:$1@$0](${ambari.namenode.principal}@${ambari.service.realm})s/.*/${ambari.hdfs.user}/
RULE:[2:$1@$0](${ambari.datanode.principal}@${ambari.service.realm})s/.*/${ambari.hdfs.user}/
RULE:[2:$1@$0](${ambari.hbasemaster.principal}@${ambari.service.realm})s/.*/${ambari.hbase.user}/
RULE:[2:$1@$0](${ambari.regionserver.principal}@${ambari.service.realm})s/.*/${ambari.hbase.user}/
RULE:[2:$1@$0](${ambari.hcat.principal}@${ambari.service.realm})s/.*/${ambari.hcat.user}/"
/>
+                <property name="hadoop.security.auth_to_local" value="RULE:[1:$1@$0](.*@<%=
ambari.user.realm %>)s/@.*// RULE:[2:$1@$0](${ambari.jobtracker.principal}@<%= ambari.service.realm
%>)s/.*/${ambari.mapreduce.user}/ RULE:[2:$1@$0](${ambari.tasktracer.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.mapreduce.user}/ RULE:[2:$1@$0](${ambari.namenode.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hdfs.user}/ RULE:[2:$1@$0](${ambari.datanode.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hdfs.user}/ RULE:[2:$1@$0](${ambari.hbasemaster.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hbase.user}/ RULE:[2:$1@$0](${ambari.regionserver.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hbase.user}/ RULE:[2:$1@$0](${ambari.hcat.principal}@<%=
ambari.service.realm %>)s/.*/${ambari.hcat.user}/" />
                 <property name="hadoop.security.authentication" value="simple" />
                 <property name="hadoop.security.authorization" value="false" />
                 <property name="hadoop.security.groups.cache.secs" value="14400" />
@@ -215,12 +218,12 @@
                 <property name="dfs.umaskmode" value="077" />
 
                 <property name="dfs.block.access.token.enable" value="false" />
-                <property name="dfs.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.namenode.kerberos.https.principal" value="host/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.secondary.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.secondary.namenode.kerberos.https.principal" value="host/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.datanode.kerberos.principal" value="${ambari.datanode.principal}/_HOST@${ambari.service.realm}"
/>
-                <property name="dfs.web.authentication.kerberos.principal" value="HTTP/_HOST@${ambari.service.realm}"
/>
+                <property name="dfs.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.namenode.kerberos.https.principal" value="host/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.secondary.namenode.kerberos.principal" value="${ambari.namenode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.secondary.namenode.kerberos.https.principal" value="host/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.datanode.kerberos.principal" value="${ambari.datanode.principal}/_HOST@<%=
ambari.service.realm %>" />
+                <property name="dfs.web.authentication.kerberos.principal" value="HTTP/_HOST@<%=
ambari.service.realm %>" />
 
                 <property name="dfs.web.authentication.kerberos.keytab" value="/etc/security/keytabs/${ambari.namenode.principal}.service.keytab"
/>
                 <property name="dfs.namenode.keytab.file" value="/etc/security/keytabs/${ambari.namenode.principal}.service.keytab"
/>



Mime
View raw message