ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [1/2] ambari git commit: AMBARI-14034 Logic for Displaying/Hidding Custom section for *-env and *-log4j should be stack driven. (ababiichuk)
Date Tue, 24 Nov 2015 09:28:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bd1b743cf -> 9f7e87e3e


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
index 89a240c..409802f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <!-- hadoop-env.sh -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
index 6b68a5b..92c0c03 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
 
   <!-- hive-env.sh -->
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml
index eb8b78b..c17793f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>is_supported_kafka_ranger</name>
     <value>true</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
index eec7436..1e86e7d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 -->
-<configuration supports_final="true">
+<configuration supports_final="true" supports_adding_forbidden="true">
 
   <property>
     <name>xml_configurations_supported</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml
index a34299a..1114ae9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
index 95a241b..2bb0862 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>nimbus_seeds_supported</name>
     <value>true</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml
index 5c681df..eae2d3a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
index 308b6a4..e802b24 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 -->
-<configuration supports_final="true">
+<configuration supports_final="true" supports_adding_forbidden="true">
 
   <property>
     <name>is_supported_yarn_ranger</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
index 16c7a7a..b226754 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
index c2be129..5dfa769 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -18,7 +18,7 @@
   ~ limitations under the License.
   -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>ams_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index e936483..086ff90 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hbase_log_dir</name>
     <value>c:\hadoop\logs\ams-hbase</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
index 2de7232..8d02656 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
@@ -18,7 +18,7 @@
   ~ limitations under the License.
   -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
index e2870d1..93ef1f5 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 -->
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>falcon_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
index 3d4a998..e06d75f 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <!-- flume-env.ps1 -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
index 867f90f..208d14f 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hbase_log_dir</name>
     <value>c:\hadoop\logs\hbase</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
index 14b4581..83cbd4b 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
@@ -24,7 +24,7 @@
 
 <!-- Put site-specific property overrides in this file. -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hdfs_log_dir_prefix</name>
     <value>c:\hadoop\logs\hadoop</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
index fb4f3d0..243196c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <!-- hcat-env.cmd -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
index 8f0037b..ee7111a 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hive_database_type</name>
     <value>mssql</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
index fe7ef18..54603d1 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <!-- webhcat-env.cmd -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
index b24c608..902a16c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>oozie_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml
index cc0714b..51d5e98 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>sqoop_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml
index a329de7..4572819 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>storm_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml
index dc15d6b..cc69edd 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>tez_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
index 315d326..ab70aad 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>mapred_log_dir_prefix</name>
     <value>c:\hadoop\logs\hadoop-mapreduce</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
index d80d970..38e4b92 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>yarn_log_dir_prefix</name>
     <value>c:\hadoop\logs\hadoop-yarn</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
index c28a0d2..220d495 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>zk_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
index fe58adb..b29bb0b 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hbase_max_direct_memory_size</name>
     <value></value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml
index 6715917..ced0ebb 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <!-- hadoop-env.cmd -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
index a6060d8..70558da 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml
index c207dbf..0efd749 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>hive.client.heapsize</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml
index c4d6dca..720a153 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
     <property>
         <name>knox_user</name>
         <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/capacity-scheduler.xml
index f1d4b48..4c215b7 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/capacity-scheduler.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
   <property>
     <name>yarn.scheduler.capacity.resource-calculator</name>
     <value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/yarn-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/yarn-env.xml
index bfe15ca..2184c0e 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration/yarn-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>yarn_cgroups_enabled</name>
     <value>false</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml
index eb6d38b..6b2032e 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml
@@ -20,7 +20,7 @@
  */
 -->
 
-<configuration>
+<configuration supports_adding_forbidden="true">
   <property>
     <name>oozie_user</name>
     <deleted>true</deleted>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
index fd9980c..95ae583 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<configuration supports_final="false">
+<configuration supports_final="false" supports_adding_forbidden="true">
 
   <property>
     <name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 493a39a..fb5ab16 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -374,15 +374,14 @@ App.StackService.configCategories = function () {
 
   // Add custom section for every configType to all the services
   configTypes.forEach(function (type) {
-    if (type.endsWith('-env') || type.endsWith('-log4j')) {
-      return;
+    if (Em.getWithDefault(this.get('configTypes')[type] || {}, 'supports.adding_forbidden',
'true') === 'false') {
+      serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({
+        name: 'Custom ' + type,
+        displayName: Em.I18n.t('common.custom') + " " + type,
+        siteFileName: type + '.xml',
+        canAddProperty: true
+      }));
     }
-    serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({
-      name: 'Custom ' + type,
-      displayName: Em.I18n.t('common.custom') + " " + type,
-      siteFileName: type + '.xml',
-      canAddProperty: true
-    }));
   }, this);
   return serviceConfigCategories;
 };

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7e87e3/ambari-web/test/models/stack_service_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/stack_service_test.js b/ambari-web/test/models/stack_service_test.js
index 4514575..8299cce 100644
--- a/ambari-web/test/models/stack_service_test.js
+++ b/ambari-web/test/models/stack_service_test.js
@@ -266,8 +266,7 @@ describe('App.StackService', function () {
       expect(ss.get('configCategories').mapProperty('name')).to.eql([
         "General",
         "Advanced",
-        "Advanced key",
-        "Custom key"
+        "Advanced key"
       ]);
     });
     it('HDFS service with DATANODE serviceComponents', function () {
@@ -278,6 +277,18 @@ describe('App.StackService', function () {
         "DATANODE",
         "General",
         "Advanced",
+        "Advanced key"]);
+    });
+
+    it('HDFS service with custom serviceComponents', function () {
+      ss.set('serviceComponents', [Em.Object.create({componentName: 'DATANODE'})]);
+      ss.set('serviceName', 'HDFS');
+      ss.set('configTypes', { key: { supports: {adding_forbidden: "false"}}});
+      ss.propertyDidChange('configCategories');
+      expect(ss.get('configCategories').mapProperty('name')).to.eql([
+        "DATANODE",
+        "General",
+        "Advanced",
         "Advanced key",
         "Custom key"]);
     });


Mime
View raw message