Repository: ambari Updated Branches: refs/heads/trunk 43d3a27c5 -> db7945d20
AMBARI-15247 ASW: User name properties are enabled to edit and override for installed services.(ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db7945d2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db7945d2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db7945d2 Branch: refs/heads/trunk Commit: db7945d204279f2bbbf727ad940d86e1c2bc78c2 Parents: 43d3a27 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Wed Mar 2 17:06:24 2016 +0200 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Wed Mar 2 17:06:24 2016 +0200 ---------------------------------------------------------------------- .../ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml | 1 + .../AMBARI_METRICS/0.1.0/configuration/ams-env.xml | 1 + .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 1 + .../FALCON/0.5.0.2.1/configuration/falcon-env.xml | 1 + .../FLUME/1.4.0.2.0/configuration/flume-env.xml | 1 + .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 1 + .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 1 + .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 3 +++ .../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 1 + .../common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml | 1 + .../MAHOUT/1.0.0.2.3/configuration/mahout-env.xml | 1 + .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 1 + .../RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml | 1 + .../SPARK/1.2.0.2.2/configuration/spark-env.xml | 1 + .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 1 + .../STORM/0.9.1.2.1/configuration/storm-env.xml | 1 + .../common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml | 1 + .../YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml | 1 + .../common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml | 1 + .../ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml | 1 + .../resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml | 2 ++ .../BIGTOP/0.8/services/FLUME/configuration/flume-env.xml | 1 + .../BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml | 1 + .../BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml | 1 + .../BIGTOP/0.8/services/HIVE/configuration/hive-env.xml | 3 +++ .../BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml | 1 + .../0.8/services/YARN/configuration-mapred/mapred-env.xml | 1 + .../BIGTOP/0.8/services/YARN/configuration/yarn-env.xml | 1 + .../0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml | 1 + .../resources/stacks/HDP/2.0.6/configuration/cluster-env.xml | 2 ++ .../stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml | 1 + .../HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml | 1 + .../resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml | 2 ++ ambari-web/app/controllers/wizard/step7_controller.js | 7 ++++++- 34 files changed, 46 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 4f9d7bf..325886f 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 @@ -100,6 +100,7 @@ <description>User for running Accumulo server processes.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml index 77cd219..609594a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml @@ -27,6 +27,7 @@ <description>Ambari Metrics User Name.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml index c3cb367..8500488 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml @@ -37,6 +37,7 @@ <description>Metadata User Name.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml index 28fcceb..9eae0d4 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml @@ -27,6 +27,7 @@ <description>Falcon user.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml index 12c0eae..29450be 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml @@ -55,6 +55,7 @@ <description>Flume User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 fb2d876..3d56411 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 @@ -99,6 +99,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <description>HBase User Name.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 2feca17..61eccce 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 @@ -181,6 +181,7 @@ <description>User to run HDFS as</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml index 14607e7..17672cb 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml @@ -121,6 +121,7 @@ <description>Hive User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> @@ -156,6 +157,7 @@ <description>HCat User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> @@ -166,6 +168,7 @@ <description>WebHCat User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml index 555bc53..b722b99 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml @@ -29,6 +29,7 @@ <description></description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 4bc023a..aa18eb4 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 @@ -44,6 +44,7 @@ <description>Knox Username.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml index 9d1d3bd..29f8c6b 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml @@ -29,6 +29,7 @@ <description>Mahout user</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml index 84d8ab7..3cb2d60 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml @@ -29,6 +29,7 @@ <description>Oozie User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml index 305282e..29d9d2a 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml @@ -28,6 +28,7 @@ <description>Kms username</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml index 24b373b..8a5117a 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml @@ -28,6 +28,7 @@ <property-type>USER</property-type> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml index 548b11b..f7e2e6c 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml @@ -56,6 +56,7 @@ export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`: <value>sqoop</value> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 5665ad3..e9f4b28 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 @@ -29,6 +29,7 @@ <description></description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml index e6ffdd1..33129a0 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml @@ -29,6 +29,7 @@ <description></description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml index 27e2c0a..d8d6e28 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml @@ -50,6 +50,7 @@ <description>Mapreduce User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml index 3586890..b570663 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml @@ -50,6 +50,7 @@ <description>YARN User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/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 9171974..7ef62bc 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 @@ -29,6 +29,7 @@ <description>ZooKeeper User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml index fb2e40d..c8f5148 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml @@ -47,6 +47,7 @@ <description>User executing service checks</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> @@ -62,6 +63,7 @@ <description>Hadoop user group.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml index c4fe06f..d94927d 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml @@ -39,6 +39,7 @@ <description>Flume User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml index 81f392f..0eafddd 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml @@ -69,6 +69,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <description>HBase User Name.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml index 7a68d5c..02e8e5f 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml @@ -89,6 +89,7 @@ <description>User to run HDFS as</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml index 6faab8b..3dc90ae 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml @@ -69,6 +69,7 @@ <description>Hive User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> @@ -92,6 +93,7 @@ <description>HCat User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> @@ -102,6 +104,7 @@ <description>WebHCat User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml index 2d77ab7..5bc5d60 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml @@ -29,6 +29,7 @@ <description>Oozie User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml index 6008a68..1263238 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml @@ -39,6 +39,7 @@ <description>Mapreduce User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml index d1dd85a..eea221e 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml @@ -39,6 +39,7 @@ <description>YARN User</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml index 8626573..74e6cae 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml @@ -29,6 +29,7 @@ <description>ZooKeeper User.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml index 0461978..784a88f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml @@ -50,6 +50,7 @@ <description>User executing service checks</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> @@ -65,6 +66,7 @@ <description>Hadoop user group.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml index 35268cd..db404f2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml @@ -69,6 +69,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <description>HBase User Name.</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml index fb315d2..5ab1619 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml @@ -42,6 +42,7 @@ <description>ECS bucket owner user</description> <value-attributes> <type>user</type> + <overridable>false</overridable> </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml index 841c4c7..58af341 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml @@ -77,6 +77,7 @@ <value-attributes> <type>user</type> <visible>false</visible> + <overridable>false</overridable> </value-attributes> </property> <property> @@ -93,6 +94,7 @@ <value-attributes> <type>user</type> <visible>false</visible> + <overridable>false</overridable> </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/db7945d2/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 91385b3..5557d69 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -522,7 +522,12 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E _updateIsEditableFlagForConfig: function (serviceConfigProperty, defaultGroupSelected) { if (App.isAuthorized('AMBARI.ADD_DELETE_CLUSTERS')) { if (defaultGroupSelected && !this.get('isHostsConfigsPage') && !Em.get(serviceConfigProperty, 'group')) { - serviceConfigProperty.set('isEditable', serviceConfigProperty.get('isReconfigurable')); + if (serviceConfigProperty.get('serviceName') === 'MISC') { + var service = App.config.get('serviceByConfigTypeMap')[App.config.getConfigTagFromFileName(serviceConfigProperty.get('filename'))]; + serviceConfigProperty.set('isEditable', service && !this.get('installedServiceNames').contains(service.get('serviceName'))); + } else { + serviceConfigProperty.set('isEditable', serviceConfigProperty.get('isReconfigurable')); + } } else if (Em.get(serviceConfigProperty, 'group') && Em.get(serviceConfigProperty, 'group.name') == this.get('selectedConfigGroup.name')) { serviceConfigProperty.set('isEditable', true); } else {