You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/11/20 23:02:07 UTC

ambari git commit: AMBARI-14002. Some hadoop-env settings do not show up on the UI. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2fef316d5 -> af95671d7


AMBARI-14002. Some hadoop-env settings do not show up on the UI. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af95671d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af95671d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af95671d

Branch: refs/heads/branch-2.1
Commit: af95671d76e80ff45570713d3bf2af730a70e494
Parents: 2fef316
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Nov 20 14:00:59 2015 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Nov 20 14:00:59 2015 -0800

----------------------------------------------------------------------
 .../1.6.1.2.2.0/configuration/accumulo-env.xml  | 11 ++++++
 .../0.96.0.2.0/configuration/hbase-env.xml      | 10 ++++++
 .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 10 ++++++
 .../KNOX/0.5.0.2.2/configuration/knox-env.xml   | 11 ++++++
 .../STORM/0.9.1.2.1/configuration/storm-env.xml | 36 ++++++++++++++++++++
 .../3.4.5.2.0/configuration/zookeeper-env.xml   | 10 ++++++
 6 files changed, 88 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index 1790a8a..d21f979 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -159,6 +159,17 @@
       <type>boolean</type>
     </value-attributes>
   </property>
+
+  <property>
+    <name>accumulo_user_keytab</name>
+    <description>Accumulo keytab path</description>
+  </property>
+
+  <property>
+    <name>accumulo_principal_name</name>
+    <description>Accumulo principal name</description>
+  </property>
+
   <property>
     <name>content</name>
     <description>The template for a client accumulo-env.sh file.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 937727d..47a753a 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -116,6 +116,16 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <description>Used in hbase-env.sh as HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir</description>
   </property>
 
+  <property>
+    <name>hbase_principal_name</name>
+    <description>HBase principal name</description>
+  </property>
+
+  <property>
+    <name>hbase_user_keytab</name>
+    <description>HBase keytab path</description>
+  </property>
+
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index c094d88..37f2ee0 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -190,6 +190,16 @@
     <description>Max number of processes limit setting for HDFS user.</description>
   </property>
 
+  <property>
+    <name>hdfs_user_keytab</name>
+    <description>HDFS keytab path</description>
+  </property>
+
+  <property>
+    <name>hdfs_principal_name</name>
+    <description>HDFS principal name</description>
+  </property>
+
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
index 7db053c..6b1f726 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
@@ -63,4 +63,15 @@
     </value-attributes>
   </property>
 
+
+  <property>
+    <name>knox_principal_name</name>
+    <description>Knox principal name</description>
+  </property>
+
+  <property>
+    <name>knox_keytab_path</name>
+    <description>Knox keytab path</description>
+  </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
index 02a9197..f4f7c3c 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
@@ -49,6 +49,42 @@
     <value>56431</value>
     <description></description>
   </property>
+
+
+  <property>
+    <name>storm_principal_name</name>
+    <description>Storm principal name</description>
+  </property>
+
+  <property>
+    <name>storm_principal_name</name>
+    <description>Storm principal name</description>
+  </property>
+
+  <property>
+    <name>storm_keytab</name>
+    <description>Storm keytab path</description>
+  </property>
+
+  <property>
+    <name>storm_ui_principal_name</name>
+    <description>Storm UI principal name</description>
+  </property>
+
+  <property>
+    <name>storm_ui_keytab</name>
+    <description>Storm UI keytab path</description>
+  </property>
+
+  <property>
+    <name>nimbus_keytab</name>
+    <description>Nimbus keytab path</description>
+  </property>
+
+  <property>
+    <name>nimbus_principal_name</name>
+    <description>Nimbus principal name</description>
+  </property>
   
   <!-- storm-env.sh -->
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/af95671d/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index 5761b8a..cabdf2c 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -51,6 +51,16 @@
     </value-attributes>
   </property>
 
+  <property>
+    <name>zookeeper_principal_name</name>
+    <description>ZooKeeper principal name</description>
+  </property>
+
+  <property>
+    <name>zookeeper_keytab_path</name>
+    <description>ZooKeeper keytab path</description>
+  </property>
+
   
   <!-- zookeeper-env.sh -->
   <property>