You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/11/18 17:51:35 UTC
[39/50] [abbrv] ambari git commit: AMBARI-13942 displaytype for log4j,
env files is hardcoded to be custom in ui code. (ababiichuk)
AMBARI-13942 displaytype for log4j, env files is hardcoded to be custom in ui code. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fdf876c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fdf876c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fdf876c
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0fdf876ce2abdf5d753af8422e034171d669e240
Parents: 31c9986
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Nov 18 15:04:57 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Nov 18 15:05:38 2015 +0200
----------------------------------------------------------------------
.../1.6.1.2.2.0/configuration/accumulo-env.xml | 3 +++
.../configuration/accumulo-log4j.xml | 1 +
.../0.1.0/configuration/ams-env.xml | 6 +++++
.../0.1.0/configuration/ams-hbase-env.xml | 3 +++
.../0.1.0/configuration/ams-hbase-log4j.xml | 1 +
.../0.1.0/configuration/ams-log4j.xml | 1 +
.../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 8 ++++++-
.../0.5.0.2.1/configuration/falcon-env.xml | 6 +++++
.../0.5.0.2.1/configuration/oozie-site.xml | 24 ++++++++++++++++++++
.../1.4.0.2.0/configuration/flume-conf.xml | 1 +
.../FLUME/1.4.0.2.0/configuration/flume-env.xml | 3 +++
.../HAWQ/2.0.0/configuration/gpcheck-env.xml | 3 +++
.../0.96.0.2.0/configuration/hbase-env.xml | 6 +++++
.../0.96.0.2.0/configuration/hbase-log4j.xml | 1 +
.../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 9 ++++++++
.../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml | 1 +
.../HIVE/0.12.0.2.0/configuration/hcat-env.xml | 3 +++
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 12 ++++++++++
.../configuration/hive-exec-log4j.xml | 1 +
.../0.12.0.2.0/configuration/hive-log4j.xml | 1 +
.../0.12.0.2.0/configuration/webhcat-env.xml | 3 +++
.../0.12.0.2.0/configuration/webhcat-log4j.xml | 1 +
.../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 6 +++++
.../0.8.1.2.2/configuration/kafka-log4j.xml | 9 ++++----
.../0.5.0.2.2/configuration/admin-topology.xml | 1 +
.../0.5.0.2.2/configuration/gateway-log4j.xml | 1 +
.../KNOX/0.5.0.2.2/configuration/knox-env.xml | 6 +++++
.../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml | 1 +
.../KNOX/0.5.0.2.2/configuration/topology.xml | 1 +
.../KNOX/0.5.0.2.2/configuration/users-ldif.xml | 1 +
.../1.0.0.2.3/configuration/mahout-env.xml | 3 +++
.../1.0.0.2.3/configuration/mahout-log4j.xml | 1 +
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 6 +++++
.../4.0.0.2.0/configuration/oozie-log4j.xml | 1 +
.../OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 3 +++
.../PIG/0.12.0.2.0/configuration/pig-env.xml | 3 +++
.../PIG/0.12.0.2.0/configuration/pig-log4j.xml | 1 +
.../0.12.0.2.0/configuration/pig-properties.xml | 1 +
.../RANGER/0.4.0/configuration/ranger-env.xml | 2 ++
.../0.5.0.2.3/configuration/kms-env.xml | 6 +++++
.../0.5.0.2.3/configuration/kms-log4j.xml | 1 +
.../0.60.0.2.2/configuration/slider-env.xml | 3 +++
.../0.60.0.2.2/configuration/slider-log4j.xml | 1 +
.../SPARK/1.2.0.2.2/configuration/spark-env.xml | 9 ++++++++
.../configuration/spark-log4j-properties.xml | 1 +
.../configuration/spark-metrics-properties.xml | 1 +
.../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 6 +++++
.../STORM/0.9.1.2.1/configuration/storm-env.xml | 6 +++++
.../TEZ/0.4.0.2.1/configuration/tez-env.xml | 6 +++++
.../configuration-mapred/mapred-env.xml | 6 +++++
.../YARN/2.1.0.2.0/configuration/yarn-env.xml | 6 +++++
.../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 1 +
.../3.4.5.2.0/configuration/zookeeper-env.xml | 6 +++++
.../3.4.5.2.0/configuration/zookeeper-log4j.xml | 1 +
.../BIGTOP/0.8/configuration/cluster-env.xml | 6 +++++
.../services/FLUME/configuration/flume-conf.xml | 3 +++
.../services/FLUME/configuration/flume-env.xml | 6 +++++
.../FLUME/configuration/flume-log4j.xml | 3 +++
.../services/HBASE/configuration/hbase-env.xml | 6 +++++
.../HBASE/configuration/hbase-log4j.xml | 3 +++
.../services/HDFS/configuration/hadoop-env.xml | 9 ++++++++
.../services/HDFS/configuration/hdfs-log4j.xml | 3 +++
.../services/HIVE/configuration/hcat-env.xml | 3 +++
.../services/HIVE/configuration/hive-env.xml | 12 ++++++++++
.../HIVE/configuration/hive-exec-log4j.xml | 3 +++
.../services/HIVE/configuration/hive-log4j.xml | 3 +++
.../services/HIVE/configuration/webhcat-env.xml | 3 +++
.../services/OOZIE/configuration/oozie-env.xml | 6 +++++
.../OOZIE/configuration/oozie-log4j.xml | 3 +++
.../0.8/services/PIG/configuration/pig-env.xml | 3 +++
.../services/PIG/configuration/pig-log4j.xml | 3 +++
.../PIG/configuration/pig-properties.xml | 3 +++
.../YARN/configuration-mapred/mapred-env.xml | 6 +++++
.../services/YARN/configuration/yarn-env.xml | 6 +++++
.../services/YARN/configuration/yarn-log4j.xml | 3 +++
.../ZOOKEEPER/configuration/zookeeper-env.xml | 6 +++++
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 3 +++
.../GLUSTERFS/configuration/hadoop-env.xml | 3 +++
.../PIG/configuration/pig-properties.xml | 3 +++
.../services/YARN/configuration/yarn-env.xml | 3 +++
.../HDP/2.0.6/configuration/cluster-env.xml | 6 +++++
.../FALCON/configuration/oozie-site.xml | 21 +++++++++++++++++
.../GLUSTERFS/configuration/hadoop-env.xml | 3 +++
.../PIG/configuration/pig-properties.xml | 3 +++
.../services/YARN/configuration/yarn-env.xml | 3 +++
.../FALCON/configuration/oozie-site.xml | 24 ++++++++++++++++++++
.../PIG/configuration/pig-properties.xml | 1 +
.../services/YARN/configuration/yarn-env.xml | 3 +++
.../FALCON/configuration/oozie-site.xml | 24 ++++++++++++++++++++
.../services/HBASE/configuration/hbase-env.xml | 6 +++++
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 3 +++
.../services/OOZIE/configuration/oozie-env.xml | 3 +++
.../services/STORM/configuration/storm-env.xml | 3 +++
.../YARN/configuration-mapred/mapred-env.xml | 3 +++
.../services/ECS/configuration/hadoop-env.xml | 14 +++++++++++-
.../services/HBASE/configuration/hbase-env.xml | 3 +++
.../configuration/cluster-env.xml.noversion | 6 +++++
.../ACCUMULO/configuration/accumulo-log4j.xml | 3 +++
.../GLUSTERFS/configuration/hadoop-env.xml | 3 +++
.../ACCUMULO/configuration/accumulo-log4j.xml | 1 +
.../services/HBASE/configuration/hbase-env.xml | 3 +++
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HIVE/configuration/hive-env.xml | 3 +++
.../PIG/configuration/pig-properties.xml | 1 +
.../STORM/configuration/storm-cluster-log4j.xml | 1 +
.../STORM/configuration/storm-worker-log4j.xml | 1 +
.../services/YARN/configuration/yarn-env.xml | 3 +++
.../services/YARN/configuration/yarn-log4j.xml | 1 +
.../KNOX/configuration/knoxsso-topology.xml | 1 +
.../HDPWIN/2.1/configuration/cluster-env.xml | 3 +++
.../AMBARI_METRICS/configuration/ams-env.xml | 3 +++
.../configuration/ams-hbase-env.xml | 3 +++
.../AMBARI_METRICS/configuration/ams-log4j.xml | 3 +++
.../FALCON/configuration/falcon-env.xml | 3 +++
.../services/FLUME/configuration/flume-conf.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 3 +++
.../services/HBASE/configuration/hbase-env.xml | 3 +++
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HIVE/configuration/hcat-env.xml | 3 +++
.../services/HIVE/configuration/hive-env.xml | 3 +++
.../services/HIVE/configuration/webhcat-env.xml | 3 +++
.../services/OOZIE/configuration/oozie-env.xml | 3 +++
.../services/SQOOP/configuration/sqoop-env.xml | 3 +++
.../services/STORM/configuration/storm-env.xml | 3 +++
.../2.1/services/TEZ/configuration/tez-env.xml | 3 +++
.../YARN/configuration-mapred/mapred-env.xml | 3 +++
.../services/YARN/configuration/yarn-env.xml | 3 +++
.../ZOOKEEPER/configuration/zookeeper-env.xml | 3 +++
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 3 +++
.../services/OOZIE/configuration/oozie-env.xml | 3 +++
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HDFS/configuration/hdfs-log4j.xml | 3 +++
.../services/HDFS/configuration/hdfs-log4j.xml | 5 +++-
.../services/FLUME/configuration/flume-conf.xml | 3 +++
.../services/FLUME/configuration/flume-env.xml | 3 +++
.../services/FLUME/configuration/flume-conf.xml | 3 +++
.../services/FLUME/configuration/flume-env.xml | 3 +++
.../FLUME/configuration/flume-log4j.xml | 3 +++
.../PIG/configuration/pig-properties.xml | 5 +++-
.../services/HDFS/configuration/hadoop-env.xml | 3 +++
.../services/HDFS/configuration/hdfs-log4j.xml | 5 +++-
.../configs/stack_config_properties_mapper.js | 4 +---
ambari-web/app/utils/config.js | 19 +++-------------
ambari-web/test/utils/config_test.js | 12 +++-------
148 files changed, 578 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 2ab5f2e..4685684 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
@@ -99,6 +99,9 @@
<value>accumulo</value>
<property-type>USER</property-type>
<description>User for running Accumulo server processes.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>accumulo_master_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
index ed1f803..6cb3337 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml
@@ -108,6 +108,7 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 8705435..7b0b84e 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
@@ -25,6 +25,9 @@
<value>ams</value>
<property-type>USER</property-type>
<description>Ambari Metrics User Name.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>metrics_collector_log_dir</name>
@@ -92,6 +95,9 @@ export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS -Djava.security.auth.login.config
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index b3f8dd1..0020fd6 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -215,6 +215,9 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/
export HADOOP_HOME={{ams_hbase_home_dir}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
index 52ead29..0261fff 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
@@ -139,6 +139,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
index 2b0a4cf..8ff682d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
@@ -58,6 +58,7 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 7d72ee4..4293412 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
@@ -35,6 +35,9 @@
<value>atlas</value>
<property-type>USER</property-type>
<description>Metadata User Name.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>metadata_opts</name>
@@ -86,5 +89,8 @@ export METADATA_PID_DIR={{pid_dir}}
# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
export METADATA_EXPANDED_WEBAPP_DIR={{expanded_war_dir}}
</value>
- </property>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 5f942f6..a4ef682 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
@@ -25,6 +25,9 @@
<value>falcon</value>
<property-type>USER</property-type>
<description>Falcon user.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>falcon_port</name>
@@ -143,6 +146,9 @@ export FALCON_DATA_DIR={{falcon_embeddedmq_data}}
# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
#export FALCON_EXPANDED_WEBAPP_DIR=
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
<property>
<name>supports_hive_dr</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
index 75a80bd..deeb999 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
@@ -39,6 +39,9 @@
This property is a convenience property to add extensions to the built in executors without having to
include all the built in ones.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -63,6 +66,9 @@
This property is a convenience property to add extensions to the built in executors without having to
include all the built in ones.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -87,6 +93,9 @@
This property is a convenience property to add extensions to the built in executors without having to
include all the built in ones.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -112,6 +121,9 @@
This property is a convenience property to add extensions to the built in executors without having to
include all the built in ones.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -139,6 +151,9 @@
This property is a convenience property to add extensions to the built in executors without having to
include all the built in ones.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -150,6 +165,9 @@
<description>
EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -161,6 +179,9 @@
<description>
EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<property>
@@ -169,6 +190,9 @@
<description>
Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed.
</description>
+ <value-attributes>
+ <type>custom</type>
+ </value-attributes>
</property>
<!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
index 94ae058..f91be65 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
@@ -30,6 +30,7 @@
# Flume agent config
</value>
<value-attributes>
+ <type>content</type>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 4821a73..275c76a 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
@@ -54,6 +54,9 @@
<value>flume</value>
<property-type>USER</property-type>
<description>Flume User</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- flume-env.sh -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
index a61a34f..f70a9c6 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
@@ -82,5 +82,8 @@ dfs.datanode.handler.count = 60
ipc.client.connection.maxidletime = 3600000
dfs.namenode.accesstime.precision = -1
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 5c53015..3a9df5d 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
@@ -98,6 +98,9 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<value>hbase</value>
<property-type>USER</property-type>
<description>HBase User Name.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>hbase_user_nofile_limit</name>
@@ -188,6 +191,9 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
index 52ead29..0261fff 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
@@ -139,6 +139,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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..6c9faa3 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
@@ -170,6 +170,9 @@
<value>users</value>
<property-type>GROUP</property-type>
<description>Proxy user group.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>hdfs_user</name>
@@ -177,6 +180,9 @@
<value>hdfs</value>
<property-type>USER</property-type>
<description>User to run HDFS as</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>hdfs_user_nofile_limit</name>
@@ -327,6 +333,9 @@ if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n
fi
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
index 8360b0e..2f4865f 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
@@ -197,6 +197,7 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
index 91b402b..c8a5882 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
@@ -52,6 +52,9 @@
USER={{hcat_user}}
METASTORE_PORT={{hive_metastore_port}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 86165be..e2f6a6e 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
@@ -113,6 +113,9 @@
<value>hive</value>
<property-type>USER</property-type>
<description>Hive User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!--HCAT-->
@@ -145,6 +148,9 @@
<value>hcat</value>
<property-type>USER</property-type>
<description>HCat User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>webhcat_user</name>
@@ -152,6 +158,9 @@
<value>hcat</value>
<property-type>USER</property-type>
<description>WebHCat User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
@@ -211,6 +220,9 @@ fi
export METASTORE_PORT={{hive_metastore_port}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
index 3181288..984f5d6 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
@@ -107,6 +107,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
index acff9e7..5d074b8 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
@@ -116,6 +116,7 @@ log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,DRFA
log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml
index bd00f6d..f78b20d 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-env.xml
@@ -49,6 +49,9 @@ CONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log
# Set HADOOP_HOME to point to a specific hadoop install directory
export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
index 2cb2533..bdad4f2 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-log4j.xml
@@ -74,6 +74,7 @@ log4j.logger.org.eclipse.jetty = INFO
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 89a4085..1738f6c 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
@@ -27,6 +27,9 @@
<value>kafka</value>
<property-type>USER</property-type>
<description></description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>kafka_log_dir</name>
@@ -79,6 +82,9 @@ if [ -f /etc/kafka/conf/kafka-ranger-env.sh ]; then
. /etc/kafka/conf/kafka-ranger-env.sh
fi
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
<property>
<name>is_supported_kafka_ranger</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
index e8e785f..cacc2e6 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-log4j.xml
@@ -111,15 +111,16 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender
log4j.additivity.state.change.logger=false
</value>
- <value-attributes>
+ <value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
- </value-attributes>
- <depends-on>
+ </value-attributes>
+ <depends-on>
<property>
<type>ranger-kafka-plugin-properties</type>
<name>ranger-kafka-plugin-enabled</name>
</property>
- </depends-on>
+ </depends-on>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
index b6b09ed..b2d0aef 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
@@ -89,6 +89,7 @@
The configuration specifies the Knox admin API configuration and access details. The authentication provider should be configured to match your deployment details.
</description>
<value-attributes>
+ <type>content</type>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
index cb2c0fc..42c4146 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
@@ -80,6 +80,7 @@
content for log4j.properties file for Knox.
</description>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 947bb70..8e40a2a 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
@@ -42,6 +42,9 @@
<value>knox</value>
<property-type>USER</property-type>
<description>Knox Username.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
@@ -50,6 +53,9 @@
<value>knox</value>
<property-type>GROUP</property-type>
<description>Knox Group.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
index ce66fbf..2d25c13 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
@@ -63,6 +63,7 @@
content for log4j.properties file for the demo LDAP that comes with Knox.
</description>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
index 636de97..6a83570 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
@@ -119,6 +119,7 @@
The configuration specifies the Hadoop cluster services Knox will provide access to.
</description>
<value-attributes>
+ <type>content</type>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
index 0fcc639..e0b5c24 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
@@ -132,6 +132,7 @@ member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
content for users-ldif file for the demo LDAP that comes with Knox.
</description>
<value-attributes>
+ <type>content</type>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 ef402d8..9020d4b 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
@@ -27,5 +27,8 @@
<value>mahout</value>
<property-type>USER</property-type>
<description>Mahout user</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
index 594c3c6..d372143 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
@@ -61,6 +61,7 @@ log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=WARN
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=WARN
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 1b1c8e5..db29a23 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
@@ -27,6 +27,9 @@
<value>oozie</value>
<property-type>USER</property-type>
<description>Oozie User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>oozie_admin_users</name>
@@ -171,6 +174,9 @@ export OOZIE_ADMIN_PORT={{oozie_server_admin_port}}
export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
index 2c48cae..94e267c 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
@@ -93,6 +93,7 @@ log4j.logger.org.hsqldb=WARN, oozie
log4j.logger.org.apache.hadoop.security.authentication.server=INFO, oozie
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
index 93742bb..a275d51 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
@@ -100,6 +100,9 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml
index aded45f..e0074e6 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-env.xml
@@ -33,6 +33,9 @@ if [ -d "/usr/lib/tez" ]; then
PIG_OPTS="$PIG_OPTS -Dmapreduce.framework.name=yarn"
fi
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
index 4f656f4..3eafc15 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
@@ -58,6 +58,7 @@ log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
index b4217ca..fbb6949 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
@@ -85,6 +85,7 @@ hcat.bin=/usr/bin/hcat
</value>
<value-attributes>
+ <type>content</type>
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index d6ac20b..e1950ad 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -27,6 +27,7 @@
<display-name>Ranger User</display-name>
<description>Ranger username</description>
<value-attributes>
+ <type>user</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -38,6 +39,7 @@
<display-name>Ranger Group</display-name>
<description>Ranger group</description>
<value-attributes>
+ <type>user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 10c14ac..8ddbade 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
@@ -26,6 +26,9 @@
<value>kms</value>
<property-type>USER</property-type>
<description>Kms username</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
@@ -34,6 +37,9 @@
<value>kms</value>
<property-type>GROUP</property-type>
<description>Kms group</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
index 8ed83a3..9c2a807 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
@@ -64,6 +64,7 @@ log4j.logger.org.apache.hadoop=INFO
log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator=OFF
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
index 80c3af1..a1c3619 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
@@ -38,6 +38,9 @@ export JAVA_HOME={{java64_home}}
# The hadoop conf directory. Optional as slider-client.xml can be edited to add properties.
export HADOOP_CONF_DIR={{hadoop_conf_dir}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
index c473844..22957a1 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
@@ -85,6 +85,7 @@ log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdaterImpl=WAR
log4j.logger.org.apache.zookeeper=WARN
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 8e871eb..ac7e34e 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
@@ -26,6 +26,9 @@
<display-name>Spark User</display-name>
<value>spark</value>
<property-type>USER</property-type>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
@@ -34,6 +37,9 @@
<value>spark</value>
<property-type>GROUP</property-type>
<description>spark group</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
@@ -98,6 +104,9 @@ else
fi
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
index 6b1d9bf..7b72d11 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
@@ -39,6 +39,7 @@ log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
index 3e544e2..a8e9f69 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
@@ -157,6 +157,7 @@
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 049d8e6..6216e71 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
@@ -44,6 +44,9 @@ export ZOOCFGDIR=${ZOOCFGDIR:-/etc/zookeeper/conf}
# add libthrift in hive to sqoop class path first so hive imports work
export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:${SQOOP_USER_CLASSPATH}"
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
<property>
<name>sqoop_user</name>
@@ -51,6 +54,9 @@ export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:
<description>User to run Sqoop as</description>
<property-type>USER</property-type>
<value>sqoop</value>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>jdbc_drivers</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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..67eff4a 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
@@ -27,6 +27,9 @@
<value>storm</value>
<property-type>USER</property-type>
<description></description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>storm_log_dir</name>
@@ -68,6 +71,9 @@ export STORM_LOG_DIR={{log_dir}}
export STORM_CONF_DIR={{conf_dir}}
export STORM_HOME={{storm_component_home_dir}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 22f5acf..8e86cae 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
@@ -27,6 +27,9 @@
<value>tez</value>
<property-type>USER</property-type>
<description></description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- tez-env.sh -->
@@ -43,5 +46,8 @@ export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
# The java implementation to use.
export JAVA_HOME={{java64_home}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 313b34f..7134d8d 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
@@ -49,6 +49,9 @@
<value>mapred</value>
<property-type>USER</property-type>
<description>Mapreduce User</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>jobhistory_heapsize</name>
@@ -91,5 +94,8 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
#export HADOOP_MAPRED_IDENT_STRING= #A string representing this instance of hadoop. $USER by default
#export HADOOP_MAPRED_NICENESS= #The scheduling priority for daemons. Defaults to 0.
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 5b9ad33..aa6a92c 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
@@ -49,6 +49,9 @@
<value>yarn</value>
<property-type>USER</property-type>
<description>YARN User</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>yarn_heapsize</name>
@@ -226,6 +229,9 @@ fi
YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
index bbd2a3f..44cf583 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
@@ -67,6 +67,7 @@ log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$Applicat
log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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..0239365 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
@@ -27,6 +27,9 @@
<value>zookeeper</value>
<property-type>USER</property-type>
<description>ZooKeeper User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>zk_log_dir</name>
@@ -70,5 +73,8 @@ export SERVER_JVMFLAGS="$SERVER_JVMFLAGS -Djava.security.auth.login.config={{zk_
export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_client_jaas_file}}"
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
index 5a68745..7a95c9d 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
@@ -97,6 +97,7 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
</value>
<value-attributes>
+ <type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 c87df1b..fb2e40d 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
@@ -45,6 +45,9 @@
<value>ambari-qa</value>
<property-type>USER</property-type>
<description>User executing service checks</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>smokeuser_keytab</name>
@@ -57,5 +60,8 @@
<value>hadoop</value>
<property-type>GROUP</property-type>
<description>Hadoop user group.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
index 74a4c15..36de434 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
@@ -27,5 +27,8 @@
<value>
# Flume agent config
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 8bab91e..4f9d1d9 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
@@ -37,6 +37,9 @@
<value>flume</value>
<property-type>USER</property-type>
<description>Flume User</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- flume-env.sh -->
@@ -75,5 +78,8 @@ export JAVA_HOME={{java_home}}
# export HIVE_HOME=/usr/lib/hive
# export HCAT_HOME=/usr/lib/hive-hcatalog
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
index 8c6ac27..e2aee7f 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
@@ -27,5 +27,8 @@
<value>
# Flume log4j config
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 b3a77ed..62849dd 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
@@ -61,6 +61,9 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<value>hbase</value>
<property-type>USER</property-type>
<description>HBase User Name.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- hbase-env.sh -->
@@ -134,6 +137,9 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70 -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
{% endif %}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
index 57b3845..9bf5317 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
@@ -138,6 +138,9 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 c32de4a..189d813 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
@@ -77,6 +77,9 @@
<value>users</value>
<property-type>GROUP</property-type>
<description>Proxy user group.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>hdfs_user</name>
@@ -84,6 +87,9 @@
<value>hdfs</value>
<property-type>USER</property-type>
<description>User to run HDFS as</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- hadoop-env.sh -->
@@ -202,6 +208,9 @@ export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
#Mostly required for hadoop 2.0
export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-amd64-64
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml
index 08822eb..2047c12 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml
@@ -196,6 +196,9 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
# Removes "deprecated" messages
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml
index 91b402b..c8a5882 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml
@@ -52,6 +52,9 @@
USER={{hcat_user}}
METASTORE_PORT={{hive_metastore_port}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 9612e7d..58d654f 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
@@ -64,6 +64,9 @@
<value>hive</value>
<property-type>USER</property-type>
<description>Hive User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!--HCAT-->
@@ -84,6 +87,9 @@
<value>hcat</value>
<property-type>USER</property-type>
<description>HCat User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>webhcat_user</name>
@@ -91,6 +97,9 @@
<value>hcat</value>
<property-type>USER</property-type>
<description>WebHCat User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<!-- hive-env.sh -->
@@ -132,6 +141,9 @@ else
fi
export METASTORE_PORT={{hive_metastore_port}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml
index fb852f7..e4a5d24 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml
@@ -106,6 +106,9 @@ log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,FA
log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml
index cb8d3a9..842ccdf 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml
@@ -115,6 +115,9 @@ log4j.category.JPOX.Enhancer=ERROR,DRFA
log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,DRFA
log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml
index 14a473f..bb6b5a1 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml
@@ -49,6 +49,9 @@ CONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log
# Set HADOOP_HOME to point to a specific hadoop install directory
export HADOOP_HOME={{hadoop_home}}
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 78498d7..768f96b 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
@@ -27,6 +27,9 @@
<value>oozie</value>
<property-type>USER</property-type>
<description>Oozie User.</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>oozie_database</name>
@@ -125,6 +128,9 @@ export OOZIE_ADMIN_PORT={{oozie_server_admin_port}}
# export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"
export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml
index 7f7158f..82ef479 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml
@@ -92,6 +92,9 @@ log4j.logger.org.mortbay=WARN, oozie
log4j.logger.org.hsqldb=WARN, oozie
log4j.logger.org.apache.hadoop.security.authentication.server=INFO, oozie
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
index aded45f..e0074e6 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
@@ -33,6 +33,9 @@ if [ -d "/usr/lib/tez" ]; then
PIG_OPTS="$PIG_OPTS -Dmapreduce.framework.name=yarn"
fi
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
index 4fe323c..318828c 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
@@ -57,6 +57,9 @@ log4j.appender.A=org.apache.log4j.ConsoleAppender
log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
index cee3211..909bc98 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
@@ -87,6 +87,9 @@ pig.location.check.strict=false
hcat.bin=/usr/bin/hcat
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/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 a725165..9e38c28 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
@@ -37,6 +37,9 @@
<value>mapred</value>
<property-type>USER</property-type>
<description>Mapreduce User</description>
+ <value-attributes>
+ <type>user</type>
+ </value-attributes>
</property>
<property>
<name>jobhistory_heapsize</name>
@@ -62,5 +65,8 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
#export HADOOP_MAPRED_IDENT_STRING= #A string representing this instance of hadoop. $USER by default
#export HADOOP_MAPRED_NICENESS= #The scheduling priority for daemons. Defaults to 0.
</value>
+ <value-attributes>
+ <type>content</type>
+ </value-attributes>
</property>
</configuration>