incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1213528 - in /incubator/ambari/trunk: ./ controller/src/main/java/org/apache/ambari/controller/ controller/src/main/java/org/apache/ambari/datastore/ controller/src/main/resources/org/apache/ambari/stacks/
Date Tue, 13 Dec 2011 01:03:18 GMT
Author: omalley
Date: Tue Dec 13 01:03:18 2011
New Revision: 1213528

URL: http://svn.apache.org/viewvc?rev=1213528&view=rev
Log:
AMBARI-156. Clean up the puppet example stack. (omalley)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Stacks.java
    incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java
    incubator/ambari/trunk/controller/src/main/resources/org/apache/ambari/stacks/puppet1-0.json

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1213528&r1=1213527&r2=1213528&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Dec 13 01:03:18 2011
@@ -2,10 +2,13 @@ Ambari Change log
 
 Release 0.1.0 - unreleased
 
-  AMBARI-155. Heartbeat response to a node should contain an empty list of actions 
-  if node doesn't belong to any cluster presently. (ddas)
+  AMBARI-156. Clean up the puppet example stack. (omalley)
 
-  AMBARI-154. Exception while starting the controller. Outdated JAXB fields in HeartBeat
class (vgogate)
+  AMBARI-155. Heartbeat response to a node should contain an empty list of 
+  actions if node doesn't belong to any cluster presently. (ddas)
+
+  AMBARI-154. Exception while starting the controller. Outdated JAXB
+  fields in HeartBeat class (vgogate)
 
   AMBARI-153. Introduce a 'ambari.properties' configuration file that
   can specify 'data.store' and a url. It defaults to 'zk://localhost:2181/',

Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Stacks.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Stacks.java?rev=1213528&r1=1213527&r2=1213528&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Stacks.java
(original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Stacks.java
Tue Dec 13 01:03:18 2011
@@ -219,8 +219,7 @@ public class Stacks {
             bpInfo.setParentRevision(bp.getParentRevision());
             List<String> componentNameVersions = new ArrayList<String>();
             for (Component com : bp.getComponents()) {
-                String comNameVersion = ""+com.getName()+"-"+com.getVersion();
-                componentNameVersions.add(comNameVersion);
+                componentNameVersions.add(com.getName());
             }
             bpInfo.setComponent(componentNameVersions);
             list.add(bpInfo);

Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java?rev=1213528&r1=1213527&r2=1213528&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java
(original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/datastore/StaticDataStore.java
Tue Dec 13 01:03:18 2011
@@ -70,6 +70,7 @@ class StaticDataStore implements DataSto
     addStackFile("org/apache/ambari/stacks/cluster123-0.xml", "cluster123");
     addStackFile("org/apache/ambari/stacks/cluster124-0.xml", "cluster124");
     addStackJsonFile("org/apache/ambari/stacks/puppet1-0.json", "puppet1");
+    addStackJsonFile("org/apache/ambari/stacks/horton-0.json", "horton");
     addClusterFile("org/apache/ambari/clusters/cluster123.xml", "cluster123");
   }
 
@@ -184,6 +185,7 @@ class StaticDataStore implements DataSto
       stacks.put(stackName, list);
     }
     int index = list.size();
+    stack.setName(stackName);
     stack.setRevision(Integer.toString(index));
     list.add(stack);
     return index;

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=1213528&r1=1213527&r2=1213528&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 13 01:03:18 2011
@@ -1,8 +1,5 @@
 {
   "@name":"puppet1",
-  "@revision":"0",
-  "@parentRevision":"-1",
-  "@creationTime":"2011-11-23T18:16:39.604-08:00",
   "repositories":{
     "@kind":"TAR",
     "urls":"http://www.apache.org/dist/hadoop/common/"
@@ -61,24 +58,20 @@
             "@value":"hadoop"
           },
           {
-            "@name":"ambari_dfs_name_dir",
-            "@value":"/var/lib/hadoop/hdfs/namenode,/var/lib/hadoop/hdfs/namenode2,/var/lib/hadoop/hdfs/namenode3"
-          },
-          {
-            "@name":"ambari_dfs_data_dir",
-            "@value":"/var/lib/hadoop/hdfs/datanode,/var/lib/hadoop/hdfs/datanode1,/var/lib/hadoop/hdfs/datanode2"
-          },
-          {
             "@name":"ambari_user_realm",
-            "@value":"EXAMPLE.KERBEROS.COM"
+            "@value":"KERBEROS.EXAMPLE.COM"
           },
           {
             "@name":"ambari_service_realm",
-            "@value":"EXAMPLE.KERBEROS.COM"
+            "@value":"<%= ambari_user_realm %>"
+          },
+          {
+            "@name":"ambari_keytab_dir",
+            "@value":"/etc/security/keytabs"
           },
           {
-            "@name":"ambari_hadoop_conf_dir",
-            "@value":"/etc/hadoop/conf"
+            "@name":"ambari_auth_to_local",
+            "@value":"RULE:[1:$1@$0](.*@<%= ambari_user_realm %>)s/@.*//\nRULE:[2:$1@$0](<%=
ambari_jobtracker_principal %>@<%= ambari_service_realm %>)s/.*/<%= ambari_mapreduce_user
%>/\nRULE:[2:$1@$0](<%= ambari_tasktracker_principal %>@<%= ambari_service_realm
%>)s/.*/<%= ambari_mapreduce_user %>/\nRULE:[2:$1@$0](<%= ambari_namenode_principal
%>@<%= ambari_service_realm %>)s/.*/<%= ambari_hdfs_user %>/\nRULE:[2:$1@$0](<%=
ambari_datanode_principal %>@<%= ambari_service_realm %>)s/.*/<%= ambari_hdfs_user
%>/\nRULE:[2:$1@$0](<%= ambari_hbasemaster_principal %>@<%= ambari_service_realm
%>)s/.*/<%= ambari_hbase_user %>/\nRULE:[2:$1@$0](<%= ambari_regionserver_principal
%>@<%= ambari_service_realm %>)s/.*/<%= ambari_hbase_user %>/\nRULE:[2:$1@$0](<%=
ambari_hcat_principal %>@<%= ambari_service_realm %>)s/.*/<%= ambari_hcat_user
%>/"
           }
         ]
       },
@@ -86,10 +79,6 @@
         "@name":"core-site.xml",
         "property":[
           {
-            "@name":"local.realm",
-            "@value":"<%= ambari_service_realm %>"
-          },
-          {
             "@name":"fs.default.name",
             "@value":"hdfs://<%= ambari_namenode_host %>:8020"
           },
@@ -98,10 +87,6 @@
             "@value":"360"
           },
           {
-            "@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_tasktracker_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
%>/"
-          },
-          {
             "@name":"hadoop.security.authentication",
             "@value":"simple"
           },
@@ -110,16 +95,8 @@
             "@value":"false"
           },
           {
-            "@name":"hadoop.security.groups.cache.secs",
-            "@value":"14400"
-          },
-          {
             "@name":"hadoop.kerberos.kinit.command",
             "@value":"/usr/kerberos/bin/kinit"
-          },
-          {
-            "@name":"hadoop.http.filter.initializers",
-            "@value":"org.apache.hadoop.http.lib.StaticUserWebFilter"
           }
         ]
       },
@@ -127,27 +104,7 @@
         "@name":"hdfs-site.xml",
         "property":[
           {
-            "@name":"*dfs.name.dir",
-            "@value":"<%= ambari_dfs_name_dir %>"
-          },
-          {
-            "@name":"*dfs.data.dir",
-            "@value":"<%= ambari_dfs_data_dir %>"
-          },
-          {
-            "@name":"dfs.safemode.threshold.pct",
-            "@value":"1.0f"
-          },
-          {
-            "@name":"dfs.datanode.address",
-            "@value":"0.0.0.0:50010"
-          },
-          {
-            "@name":"dfs.datanode.http.address",
-            "@value":"0.0.0.0:50075"
-          },
-          {
-            "@name":"*dfs.http.address",
+            "@name":"dfs.http.address",
             "@value":"<%= ambari_namenode_host %>:50070"
           },
           {
@@ -183,62 +140,14 @@
             "@value":"HTTP/_HOST@<%= ambari_service_realm %>"
           },
           {
-            "@name":"dfs.web.authentication.kerberos.keytab",
-            "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-          },
-          {
-            "@name":"dfs.namenode.keytab.file",
-            "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-          },
-          {
-            "@name":"dfs.secondary.namenode.keytab.file",
-            "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-          },
-          {
-            "@name":"dfs.datanode.keytab.file",
-            "@value":"/etc/security/keytabs/<%= ambari_datanode_principal %>.service.keytab"
-          },
-          {
-            "@name":"dfs.secondary.https.port",
-            "@value":"50490"
-          },
-          {
-            "@name":"dfs.https.port",
-            "@value":"50470"
-          },
-          {
             "@name":"dfs.https.address",
             "@value":"<%= ambari_namenode_host %>:50470"
           },
           {
-            "@name":"dfs.datanode.data.dir.perm",
-            "@value":"700"
-          },
-          {
-            "@name":"dfs.cluster.administrators",
-            "@value":"<%= ambari_hdfs_user %>"
-          },
-          {
-            "@name":"dfs.permissions.superusergroup",
-            "@value":"<%= ambari_admin_group %>"
-          },
-          {
             "@name":"dfs.secondary.http.address",
             "@value":"<%= ambari_namenode_host %>:50090"
           },
           {
-            "@name":"dfs.hosts",
-            "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name %>/<%=
ambari_role_name %>/dfs.include"
-          },
-          {
-            "@name":"dfs.hosts.exclude",
-            "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name %>/<%=
ambari_role_name %>/dfs.exclude"
-          },
-          {
-            "@name":"dfs.webhdfs.enabled",
-            "@value":"true"
-          },
-          {
             "@name":"dfs.support.append",
             "@value":"true"
           }
@@ -249,72 +158,21 @@
         "property":[
           {
             "@name":"JAVA_HOME",
-            "@value":"/usr/jdk1.6.0_27"
+            "@value":"/usr/java/latest"
           },
           {
             "@name":"HADOOP_CONF_DIR",
-            "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name %>/<%=
ambari_role_name %>"
+            "@value":"<%= ambari_role_prefix %>/etc/hadoop"
           },
           {
             "@name":"HADOOP_OPTS",
             "@value":"-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
           },
           {
-            "@name":"HADOOP_NAMENODE_OPTS",
-            "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_NAMENODE_OPTS"
-          },
-          {
-            "@name":"HADOOP_SECONDARYNAMENODE_OPTS",
-            "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_SECONDARYNAMENODE_OPTS"
-          },
-          {
-            "@name":"HADOOP_JOBTRACKER_OPTS",
-            "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dmapred.audit.logger=INFO,MRAUDIT
-Dhadoop.mapreduce.jobsummary.logger=INFO,JSA $HADOOP_JOBTRACKER_OPTS"
-          },
-          {
-            "@name":"HADOOP_TASKTRACKER_OPTS",
-            "@value":"-Dsecurity.audit.logger=ERROR,console -Dmapred.audit.logger=ERROR,console
$HADOOP_TASKTRACKER_OPTS"
-          },
-          {
-            "@name":"HADOOP_DATANODE_OPTS",
-            "@value":"-Dsecurity.audit.logger=ERROR,DRFAS $HADOOP_DATANODE_OPTS"
-          },
-          {
             "@name":"HADOOP_CLIENT_OPTS",
             "@value":"-Xmx128m $HADOOP_CLIENT_OPTS"
-          },
-          {
-            "@name":"HADOOP_SECURE_DN_USER",
-            "@value":""
-          },
-          {
-            "@name":"HADOOP_LOG_DIR",
-            "@value":"/var/log/hadoop/$USER"
-          },
-          {
-            "@name":"HADOOP_SECURE_DN_LOG_DIR",
-            "@value":"/var/log/hadoop/<%= ambari_hdfs_user %>"
-          },
-          {
-            "@name":"HADOOP_PID_DIR",
-            "@value":"/var/run/hadoop"
-          },
-          {
-            "@name":"HADOOP_SECURE_DN_PID_DIR",
-            "@value":"/var/run/hadoop"
-          },
-          {
-            "@name":"HADOOP_IDENT_STRING",
-            "@value":"<%= ambari_cluster_name %>"
           }
         ]
-      },
-      {
-        "@name":"hadoop-metrics2.properties",
-        "property":{
-          "@name":"*.period",
-          "@value":"60"
-        }
       }
     ]
   },
@@ -332,498 +190,162 @@
     },
     {
       "@name":"hdfs",
-      "@architecture":"x86_64",
-      "@version":"0.20.205.0",
       "@provider":"org.apache.hadoop",
       "definition":{
         "@provider":"org.apache.ambari",
         "@name":"hadoop-hdfs",
         "@version":"0.1.0"
       },
-      "roles":[
-        {
-          "@name":"namenode",
-          "configuration":{
-            "category":[
-              {
-                "@name":"core-site.xml",
-                "property":[
-                  {
-                    "@name":"local.realm",
-                    "@value":"<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"fs.default.name",
-                    "@value":"hdfs://<%= ambari_namenode_host %>:8020"
-                  },
-                  {
-                    "@name":"fs.trash.interval",
-                    "@value":"360"
-                  },
-                  {
-                    "@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_tasktracker_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
%>/"
-                  },
-                  {
-                    "@name":"hadoop.security.authentication",
-                    "@value":"simple"
-                  },
-                  {
-                    "@name":"hadoop.security.authorization",
-                    "@value":"false"
-                  },
-                  {
-                    "@name":"hadoop.security.groups.cache.secs",
-                    "@value":"14400"
-                  },
-                  {
-                    "@name":"hadoop.kerberos.kinit.command",
-                    "@value":"/usr/kerberos/bin/kinit"
-                  },
-                  {
-                    "@name":"hadoop.http.filter.initializers",
-                    "@value":"org.apache.hadoop.http.lib.StaticUserWebFilter"
-                  }
-                ]
-              },
-              {
-                "@name":"hdfs-site.xml",
-                "property":[
-                  {
-                    "@name":"*dfs.name.dir",
-                    "@value":"<%= ambari_dfs_name_dir %>"
-                  },
-                  {
-                    "@name":"*dfs.data.dir",
-                    "@value":"<%= ambari_dfs_data_dir %>"
-                  },
-                  {
-                    "@name":"dfs.safemode.threshold.pct",
-                    "@value":"1.0f"
-                  },
-                  {
-                    "@name":"dfs.datanode.address",
-                    "@value":"0.0.0.0:50010"
-                  },
-                  {
-                    "@name":"dfs.datanode.http.address",
-                    "@value":"0.0.0.0:50075"
-                  },
-                  {
-                    "@name":"*dfs.http.address",
-                    "@value":"<%= ambari_namenode_host %>:50070"
-                  },
-                  {
-                    "@name":"dfs.umaskmode",
-                    "@value":"077"
-                  },
-                  {
-                    "@name":"dfs.block.access.token.enable",
-                    "@value":"false"
-                  },
-                  {
-                    "@name":"dfs.namenode.kerberos.principal",
-                    "@value":"<%= ambari_namenode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.namenode.kerberos.https.principal",
-                    "@value":"host/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.kerberos.principal",
-                    "@value":"<%= ambari_namenode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.kerberos.https.principal",
-                    "@value":"host/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.datanode.kerberos.principal",
-                    "@value":"<%= ambari_datanode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.web.authentication.kerberos.principal",
-                    "@value":"HTTP/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.web.authentication.kerberos.keytab",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.namenode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.datanode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_datanode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.secondary.https.port",
-                    "@value":"50490"
-                  },
-                  {
-                    "@name":"dfs.https.port",
-                    "@value":"50470"
-                  },
-                  {
-                    "@name":"dfs.https.address",
-                    "@value":"<%= ambari_namenode_host %>:50470"
-                  },
-                  {
-                    "@name":"dfs.datanode.data.dir.perm",
-                    "@value":"700"
-                  },
-                  {
-                    "@name":"dfs.cluster.administrators",
-                    "@value":"<%= ambari_hdfs_user %>"
-                  },
-                  {
-                    "@name":"dfs.permissions.superusergroup",
-                    "@value":"<%= ambari_admin_group %>"
-                  },
-                  {
-                    "@name":"dfs.secondary.http.address",
-                    "@value":"<%= ambari_namenode_host %>:50090"
-                  },
-                  {
-                    "@name":"dfs.hosts",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>/dfs.include"
-                  },
-                  {
-                    "@name":"dfs.hosts.exclude",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>/dfs.exclude"
-                  },
-                  {
-                    "@name":"dfs.webhdfs.enabled",
-                    "@value":"true"
-                  },
-                  {
-                    "@name":"dfs.support.append",
-                    "@value":"true"
-                  }
-                ]
-              },
-              {
-                "@name":"hadoop-env.sh",
-                "property":[
-                  {
-                    "@name":"JAVA_HOME",
-                    "@value":"/usr/jdk1.6.0_27"
-                  },
-                  {
-                    "@name":"HADOOP_CONF_DIR",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>"
-                  },
-                  {
-                    "@name":"HADOOP_OPTS",
-                    "@value":"-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_NAMENODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_NAMENODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_SECONDARYNAMENODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_SECONDARYNAMENODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_JOBTRACKER_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dmapred.audit.logger=INFO,MRAUDIT
-Dhadoop.mapreduce.jobsummary.logger=INFO,JSA $HADOOP_JOBTRACKER_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_TASKTRACKER_OPTS",
-                    "@value":"-Dsecurity.audit.logger=ERROR,console -Dmapred.audit.logger=ERROR,console
$HADOOP_TASKTRACKER_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_DATANODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=ERROR,DRFAS $HADOOP_DATANODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_CLIENT_OPTS",
-                    "@value":"-Xmx128m $HADOOP_CLIENT_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_USER",
-                    "@value":""
-                  },
-                  {
-                    "@name":"HADOOP_LOG_DIR",
-                    "@value":"/var/log/hadoop/$USER"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_LOG_DIR",
-                    "@value":"/var/log/hadoop/<%= ambari_hdfs_user %>"
-                  },
-                  {
-                    "@name":"HADOOP_PID_DIR",
-                    "@value":"/var/run/hadoop"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_PID_DIR",
-                    "@value":"/var/run/hadoop"
-                  },
-                  {
-                    "@name":"HADOOP_IDENT_STRING",
-                    "@value":"<%= ambari_cluster_name %>"
-                  }
-                ]
-              },
-              {
-                "@name":"hadoop-metrics2.properties",
-                "property":{
-                  "@name":"*.period",
-                  "@value":"60"
-                }
+      "configuration":{
+        "category":[
+          {
+            "@name":"core-site.xml",
+            "property":[
+              {
+                "@name":"hadoop.security.auth_to_local",
+                "@value":"<%= ambari_auth_to_local %>"
+              },
+              {
+                "@name":"hadoop.security.groups.cache.secs",
+                "@value":"14400"
+              },
+              {
+                "@name":"hadoop.http.filter.initializers",
+                "@value":"org.apache.hadoop.http.lib.StaticUserWebFilter"
               }
             ]
-          }
-        },
-        {
-          "@name":"datanode",
-          "configuration":{
-            "category":[
-              {
-                "@name":"core-site.xml",
-                "property":[
-                  {
-                    "@name":"local.realm",
-                    "@value":"<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"fs.default.name",
-                    "@value":"hdfs://<%= ambari_namenode_host %>:8020"
-                  },
-                  {
-                    "@name":"fs.trash.interval",
-                    "@value":"360"
-                  },
-                  {
-                    "@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_tasktracker_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
%>/"
-                  },
-                  {
-                    "@name":"hadoop.security.authentication",
-                    "@value":"simple"
-                  },
-                  {
-                    "@name":"hadoop.security.authorization",
-                    "@value":"false"
-                  },
-                  {
-                    "@name":"hadoop.security.groups.cache.secs",
-                    "@value":"14400"
-                  },
-                  {
-                    "@name":"hadoop.kerberos.kinit.command",
-                    "@value":"/usr/kerberos/bin/kinit"
-                  },
-                  {
-                    "@name":"hadoop.http.filter.initializers",
-                    "@value":"org.apache.hadoop.http.lib.StaticUserWebFilter"
-                  }
-                ]
-              },
-              {
-                "@name":"hdfs-site.xml",
-                "property":[
-                  {
-                    "@name":"*dfs.name.dir",
-                    "@value":"<%= ambari_dfs_name_dir %>"
-                  },
-                  {
-                    "@name":"*dfs.data.dir",
-                    "@value":"<%= ambari_dfs_data_dir %>"
-                  },
-                  {
-                    "@name":"dfs.safemode.threshold.pct",
-                    "@value":"1.0f"
-                  },
-                  {
-                    "@name":"dfs.datanode.address",
-                    "@value":"0.0.0.0:50010"
-                  },
-                  {
-                    "@name":"dfs.datanode.http.address",
-                    "@value":"0.0.0.0:50075"
-                  },
-                  {
-                    "@name":"*dfs.http.address",
-                    "@value":"<%= ambari_namenode_host %>:50070"
-                  },
-                  {
-                    "@name":"dfs.umaskmode",
-                    "@value":"077"
-                  },
-                  {
-                    "@name":"dfs.block.access.token.enable",
-                    "@value":"false"
-                  },
-                  {
-                    "@name":"dfs.namenode.kerberos.principal",
-                    "@value":"<%= ambari_namenode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.namenode.kerberos.https.principal",
-                    "@value":"host/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.kerberos.principal",
-                    "@value":"<%= ambari_namenode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.kerberos.https.principal",
-                    "@value":"host/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.datanode.kerberos.principal",
-                    "@value":"<%= ambari_datanode_principal %>/_HOST@<%= ambari_service_realm
%>"
-                  },
-                  {
-                    "@name":"dfs.web.authentication.kerberos.principal",
-                    "@value":"HTTP/_HOST@<%= ambari_service_realm %>"
-                  },
-                  {
-                    "@name":"dfs.web.authentication.kerberos.keytab",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.namenode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.secondary.namenode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_namenode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.datanode.keytab.file",
-                    "@value":"/etc/security/keytabs/<%= ambari_datanode_principal %>.service.keytab"
-                  },
-                  {
-                    "@name":"dfs.secondary.https.port",
-                    "@value":"50490"
-                  },
-                  {
-                    "@name":"dfs.https.port",
-                    "@value":"50470"
-                  },
-                  {
-                    "@name":"dfs.https.address",
-                    "@value":"<%= ambari_namenode_host %>:50470"
-                  },
-                  {
-                    "@name":"dfs.datanode.data.dir.perm",
-                    "@value":"700"
-                  },
-                  {
-                    "@name":"dfs.cluster.administrators",
-                    "@value":"<%= ambari_hdfs_user %>"
-                  },
-                  {
-                    "@name":"dfs.permissions.superusergroup",
-                    "@value":"<%= ambari_admin_group %>"
-                  },
-                  {
-                    "@name":"dfs.secondary.http.address",
-                    "@value":"<%= ambari_namenode_host %>:50090"
-                  },
-                  {
-                    "@name":"dfs.hosts",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>/dfs.include"
-                  },
-                  {
-                    "@name":"dfs.hosts.exclude",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>/dfs.exclude"
-                  },
-                  {
-                    "@name":"dfs.webhdfs.enabled",
-                    "@value":"true"
-                  },
-                  {
-                    "@name":"dfs.support.append",
-                    "@value":"true"
-                  }
-                ]
-              },
-              {
-                "@name":"hadoop-env.sh",
-                "property":[
-                  {
-                    "@name":"JAVA_HOME",
-                    "@value":"/usr/jdk1.6.0_27"
-                  },
-                  {
-                    "@name":"HADOOP_CONF_DIR",
-                    "@value":"<%= ambari_hadoop_conf_dir %>/<%= ambari_cluster_name
%>/<%= ambari_role_name %>"
-                  },
-                  {
-                    "@name":"HADOOP_OPTS",
-                    "@value":"-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_NAMENODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_NAMENODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_SECONDARYNAMENODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
$HADOOP_SECONDARYNAMENODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_JOBTRACKER_OPTS",
-                    "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dmapred.audit.logger=INFO,MRAUDIT
-Dhadoop.mapreduce.jobsummary.logger=INFO,JSA $HADOOP_JOBTRACKER_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_TASKTRACKER_OPTS",
-                    "@value":"-Dsecurity.audit.logger=ERROR,console -Dmapred.audit.logger=ERROR,console
$HADOOP_TASKTRACKER_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_DATANODE_OPTS",
-                    "@value":"-Dsecurity.audit.logger=ERROR,DRFAS $HADOOP_DATANODE_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_CLIENT_OPTS",
-                    "@value":"-Xmx128m $HADOOP_CLIENT_OPTS"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_USER",
-                    "@value":""
-                  },
-                  {
-                    "@name":"HADOOP_LOG_DIR",
-                    "@value":"/var/log/hadoop/$USER"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_LOG_DIR",
-                    "@value":"/var/log/hadoop/<%= ambari_hdfs_user %>"
-                  },
-                  {
-                    "@name":"HADOOP_PID_DIR",
-                    "@value":"/var/run/hadoop"
-                  },
-                  {
-                    "@name":"HADOOP_SECURE_DN_PID_DIR",
-                    "@value":"/var/run/hadoop"
-                  },
-                  {
-                    "@name":"HADOOP_IDENT_STRING",
-                    "@value":"<%= ambari_cluster_name %>"
-                  }
-                ]
-              },
-              {
-                "@name":"hadoop-metrics2.properties",
-                "property":{
-                  "@name":"*.period",
-                  "@value":"60"
-                }
+          },
+          {
+            "@name":"hdfs-site.xml",
+            "property":[
+              {
+                "@name":"dfs.name.dir",
+                "@value":"<%= ambari_role_prefix %>/hdfs/name"
+              },
+              {
+                "@name":"dfs.data.dir",
+                "@value":"<%= ambari_role_prefix %>/hdfs/data"
+              },
+              {
+                "@name":"dfs.safemode.threshold.pct",
+                "@value":"1.0f"
+              },
+              {
+                "@name":"dfs.datanode.address",
+                "@value":"0.0.0.0:50010"
+              },
+              {
+                "@name":"dfs.datanode.http.address",
+                "@value":"0.0.0.0:50075"
+              },
+              {
+                "@name":"dfs.web.authentication.kerberos.keytab",
+                "@value":"<%= ambari_keytab_dir %>/<%= ambari_namenode_principal
=>.service.keytab"
+              },
+              {
+                "@name":"dfs.namenode.keytab.file",
+                "@value":"<%= ambari_keytab_dir %>/<%= ambari_namenode_principal
%>.service.keytab"
+              },
+              {
+                "@name":"dfs.secondary.namenode.keytab.file",
+                "@value":"<%= ambari_keytab_dir %>/<%= ambari_namenode_principal
%>.service.keytab"
+              },
+              {
+                "@name":"dfs.datanode.keytab.file",
+                "@value":"<%= ambari_keytab_dir %>/<%= ambari_datanode_principal
%>.service.keytab"
+              },
+              {
+                "@name":"dfs.secondary.https.port",
+                "@value":"50490"
+              },
+              {
+                "@name":"dfs.https.port",
+                "@value":"50470"
+              },
+              {
+                "@name":"dfs.https.address",
+                "@value":"<%= ambari_namenode_host %>:50470"
+              },
+              {
+                "@name":"dfs.datanode.data.dir.perm",
+                "@value":"700"
+              },
+              {
+                "@name":"dfs.cluster.administrators",
+                "@value":"<%= ambari_hdfs_user %>"
+              },
+              {
+                "@name":"dfs.permissions.superusergroup",
+                "@value":"<%= ambari_admin_group %>"
+              },
+              {
+                "@name":"dfs.secondary.http.address",
+                "@value":"<%= ambari_namenode_host %>:50090"
+              },
+              {
+                "@name":"dfs.hosts",
+                "@value":"<%= ambari_role_prefix %>/etc/hadoop/dfs.include"
+              },
+              {
+                "@name":"dfs.hosts.exclude",
+                "@value":"<%= ambari_role_prefix %>/etc/hadoop/dfs.exclude"
+              },
+              {
+                "@name":"dfs.webhdfs.enabled",
+                "@value":"true"
+              }
+            ]
+          },
+          {
+            "@name":"hadoop-env.sh",
+            "property":[
+              {
+                "@name":"HADOOP_NAMENODE_OPTS",
+                "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT"
+              },
+              {
+                "@name":"HADOOP_SECONDARYNAMENODE_OPTS",
+                "@value":"-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT"
+              },
+              {
+                "@name":"HADOOP_DATANODE_OPTS",
+                "@value":"-Dsecurity.audit.logger=ERROR,DRFAS"
+              },
+              {
+                "@name":"HADOOP_SECURE_DN_USER",
+                "@value":""
+              },
+              {
+                "@name":"HADOOP_LOG_DIR",
+                "@value":"<%= ambari_role_prefix %>/logs"
+              },
+              {
+                "@name":"HADOOP_SECURE_DN_LOG_DIR",
+                "@value":"<%= ambari_role_prefix %>/logs/secure"
+              },
+              {
+                "@name":"HADOOP_PID_DIR",
+                "@value":"<%= ambari_role_prefix %>/pids"
+              },
+              {
+                "@name":"HADOOP_SECURE_DN_PID_DIR",
+                "@value":"<%= ambari_role_prefix %>/pids/secure"
+              },
+              {
+                "@name":"HADOOP_IDENT_STRING",
+                "@value":"<%= ambari_cluster_name %>"
               }
             ]
+           },
+          {
+            "@name":"hadoop-metrics2.properties",
+            "property":{
+              "@name":"*.period",
+              "@value":"60"
+            }
           }
-        }
-      ]
+        ]
+      }
     }
   ]
 }
\ No newline at end of file



Mime
View raw message