AMBARI-13942 displaytype for log4j, env files is hardcoded to be custom in ui code. (ababiichuk)

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>

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>

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>

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>

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>

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>

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>

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>

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-->

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>

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 -->

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>

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>
 
 

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>

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" ] &#038;&#038; [ "$EUID" -eq 0 ] &#038;&#038; [ -n
 fi
 {% endif %}
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
   
 </configuration>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>     

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml

@@ -37,6 +37,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>
@@ -180,6 +183,9 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
 fi
 YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml

@@ -66,6 +66,9 @@ log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
 log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=${yarn.server.resourcemanager.appsummary.logger}
 log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/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_data_dir</name>
@@ -82,5 +85,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>

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml

@@ -96,6 +96,9 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
 ### Notice we are including log4j's NDC here (%x)
 log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml

@@ -191,6 +191,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>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml

@@ -86,6 +86,9 @@ pig.location.check.strict=false
 hcat.bin=/usr/bin/hcat
 
     </value>
+    <value-attributes>
+        <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml

@@ -178,5 +178,8 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
 fi
 YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml

@@ -48,6 +48,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>
@@ -60,6 +63,9 @@
         <value>hadoop</value>
         <property-type>GROUP</property-type>
         <description>Hadoop user group.</description>
+        <value-attributes>
+            <type>user</type>
+        </value-attributes>
     </property>
     <property>
         <name>repo_suse_rhel_template</name>

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml

@@ -37,6 +37,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>
@@ -59,6 +62,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>
@@ -81,6 +87,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>
@@ -104,6 +113,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>
@@ -129,6 +141,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>
@@ -140,6 +155,9 @@
     <description>
       EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
     </description>
+    <value-attributes>
+      <type>custom</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -151,6 +169,9 @@
     <description>
       EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
     </description>
+    <value-attributes>
+      <type>custom</type>
+    </value-attributes>
   </property>
   <!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
   <!--<property>-->

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml

@@ -217,6 +217,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>

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml

@@ -86,6 +86,9 @@ pig.location.check.strict=false
 hcat.bin=/usr/bin/hcat
 
     </value>
+    <value-attributes>
+        <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml

@@ -178,5 +178,8 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
 fi
 YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml

@@ -37,6 +37,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>
@@ -59,6 +62,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>
@@ -81,6 +87,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>
@@ -104,6 +113,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>
@@ -129,6 +141,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>
@@ -140,6 +155,9 @@
     <description>
       EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
     </description>
+    <value-attributes>
+      <type>custom</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -151,6 +169,9 @@
     <description>
       EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
     </description>
+    <value-attributes>
+      <type>custom</type>
+    </value-attributes>
   </property>
   
   <property>
@@ -159,6 +180,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-->

ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml

@@ -88,6 +88,7 @@ hcat.bin=/usr/bin/hcat
     </value>
     <description>Describe all the Pig agent configurations</description>
     <value-attributes>
+      <type>content</type>
       <empty-value-valid>true</empty-value-valid>
       <show-property-name>false</show-property-name>
     </value-attributes>

ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml

@@ -151,6 +151,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>

ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/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,5 +190,8 @@
     <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>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml

@@ -66,6 +66,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_max_direct_memory_size</name>
@@ -173,6 +176,9 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_
 # HBase off-heap MaxDirectMemorySize
 export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS {% if hbase_max_direct_memory_size %} -XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m {% endif %}"
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml

@@ -177,6 +177,9 @@ if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n
 fi
 {% endif %}
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
   
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml

@@ -218,6 +218,7 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
 #log4j.logger.BlockStateChange=WARN
     </value>
     <value-attributes>
+      <type>content</type>
       <show-property-name>false</show-property-name>
     </value-attributes>
   </property>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml

@@ -84,6 +84,9 @@ fi
 export METASTORE_PORT={{hive_metastore_port}}
 
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
   <property>

ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml

@@ -102,6 +102,9 @@ export CATALINA_OPTS="${CATALINA_OPTS} -Xmx2048m"
 {% endif %}
 
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml

@@ -36,5 +36,8 @@ export JAVA_HOME={{java64_home}}
 export STORM_CONF_DIR={{conf_dir}}
 export STORM_HOME={{storm_component_home_dir}}
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml

@@ -44,5 +44,8 @@ export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
 export HADOOP_OPTS="-Djava.io.tmpdir={{hadoop_java_io_tmpdir}} $HADOOP_OPTS"
 export JAVA_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:{{hadoop_java_io_tmpdir}}"
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml

@@ -29,20 +29,29 @@
   <property>
     <name>proxyuser_group</name>
     <value>users</value>
-    <property-type>GROUP</property-type>`
+    <property-type>GROUP</property-type>
     <description>Proxy user group.</description>
+    <value-attributes>
+      <type>user</type>
+    </value-attributes>
   </property>
   <property>
     <name>hdfs_user</name>
     <value>hdfs</value>
     <property-type>USER</property-type>
     <description>ECS bucket owner user</description>
+    <value-attributes>
+      <type>user</type>
+    </value-attributes>
   </property>
   <property>
     <name>user_group</name>
     <value>hadoop</value>
     <property-type>GROUP</property-type>
     <description>Proxy user group.</description>
+    <value-attributes>
+      <type>user</type>
+    </value-attributes>
   </property>
   <!-- hadoop-env.sh -->
   <property>
@@ -125,6 +134,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>

ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml

@@ -102,6 +102,9 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}} $JDK_DEPEND
 export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}} {% if hbase_max_direct_memory_size %} -XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m {% endif %} $JDK_DEPENDED_OPTS"
 {% endif %}
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml.noversion

@@ -41,6 +41,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>
@@ -52,5 +55,8 @@
         <value>hadoop</value>
         <property-type>GROUP</property-type>
         <description>Hadoop user group.</description>
+        <value-attributes>
+            <type>user</type>
+        </value-attributes>
     </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml

@@ -107,6 +107,9 @@ log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 
     </value>
+    <value-attributes>
+      <type>content</type>
+    </value-attributes>
   </property>
 
 </configuration>