http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml index f391257..bad4686 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml @@ -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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml index 8c44b9e..aba7e38 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml index 11fbd1f..fc374d5 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml index d7edd1b..e2106c9 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index 9cbcd59..60f8b06 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml index 480be75..9fc8188 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/PIG/configuration/pig-properties.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml index 14b4e54..ff08e34 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml index 805aa29..f1930ce 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml index 4b0bf70..89e914b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml +++ b/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>--> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index 0c8fd0a..ec3af73 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml index 480be75..9fc8188 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/PIG/configuration/pig-properties.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml index 14b4e54..ff08e34 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml index c6962f3..b7254bc 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml +++ b/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--> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml index 5746109..1a3a0d6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml index 3545ea1..a09fc58 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml index e51990f..dfe352ad9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml index 98f3fe4..bbb5f72 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml index 41783f4..179aedd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml index f627add..a6060d8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml index f84bc01..b3ae67f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml index f0621cd..10b1789 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml index aa52d3b..5dd51e4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml index 0046eb9..668af46 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml index 8e8896f..16169bf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml index b28f50e..1f65d98 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml.noversion ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml.noversion b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml.noversion index d41ff98..9694aa2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml.noversion +++ b/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml index 20c858e..a512d3f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index b6ea298..146e470 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml index ff43b57..4df6dc3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/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/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml index baf7c0e..617a605 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-env.xml @@ -102,6 +102,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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml index 6d840a4..89a240c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml @@ -153,6 +153,9 @@ if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n fi {% endif %} </value> + <value-attributes> + <type>content</type> + </value-attributes> </property> <property> <name>nfsgateway_heapsize</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml index 77de518..6b68a5b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml @@ -74,6 +74,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/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml index ac248b3..ebba6be 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml @@ -631,6 +631,7 @@ pig.tez.grace.parallelism=true </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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml index 61a120d..a34299a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-cluster-log4j.xml @@ -105,6 +105,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/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml index 0b5bfd1..5c681df 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-worker-log4j.xml @@ -106,6 +106,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/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml index 699463b..308b6a4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml @@ -151,5 +151,8 @@ 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/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml index b52af80..16c7a7a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml @@ -76,6 +76,7 @@ log4j.appender.EWMA.messageAgeLimitSeconds=${yarn.ewma.messageAgeLimitSeconds} log4j.appender.EWMA.maxUniqueMessages=${yarn.ewma.maxUniqueMessages} </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/HDP/2.4/services/KNOX/configuration/knoxsso-topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/configuration/knoxsso-topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/configuration/knoxsso-topology.xml index 0a617ad..38128bd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/configuration/knoxsso-topology.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/configuration/knoxsso-topology.xml @@ -86,6 +86,7 @@ The configuration specifies the KnoxSSO provider integration, cookie and token management 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/stacks/HDPWIN/2.1/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml index d80ad6c..841c4c7 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml @@ -28,6 +28,7 @@ <property-type>USER</property-type> <description>User to run Hadoop services under</description> <value-attributes> + <type>user</type> <visible>false</visible> <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> @@ -74,6 +75,7 @@ <property-type>USER</property-type> <description>User executing service checks</description> <value-attributes> + <type>user</type> <visible>false</visible> </value-attributes> </property> @@ -89,6 +91,7 @@ <property-type>GROUP</property-type> <description>Hadoop user group.</description> <value-attributes> + <type>user</type> <visible>false</visible> </value-attributes> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml index 1a8969c..c2be129 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml @@ -52,6 +52,9 @@ <name>content</name> <value> </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/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml index ae2aa9a..e936483 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml @@ -42,6 +42,9 @@ <description>This is the jinja template for hbase-env.cmd file</description> <value> </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/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml index fcfdc24..2de7232 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml @@ -54,6 +54,9 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %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/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml index f0fc01b..e2870d1 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml @@ -62,5 +62,8 @@ <description>This is the jinja template for falcon-env.cmd file</description> <value> </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/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml index 94ae058..f91be65 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/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/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml index 053cb57..3d4a998 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml @@ -53,5 +53,8 @@ # $HIVE_HOME= # $HCAT_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/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml index 585c6ca..867f90f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml @@ -115,5 +115,8 @@ set HBASE_USE_GC_LOGFILE=true @rem Tell HBase whether it should manage it's own instance of Zookeeper or not. @rem set HBASE_MANAGES_ZK=true </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/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml index 8433005..14b4581 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml @@ -152,5 +152,8 @@ set HADOOP_SECURE_DN_PID_DIR=%HADOOP_PID_DIR% @rem A string representing this instance of hadoop. %USERNAME% by default. set HADOOP_IDENT_STRING=%USERNAME% </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/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml index ee18f17..fb4f3d0 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml @@ -27,5 +27,8 @@ <description>This is the jinja template for hcat-env.cmd file</description> <value> </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/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml index a81c033..8f0037b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml @@ -107,5 +107,8 @@ <description>hive-env.cmd content</description> <value> </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/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml index cd0cb75..fe7ef18 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml @@ -27,5 +27,8 @@ <description>webhcat-env.cmd content</description> <value> </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/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml index 57c492a..b24c608 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml @@ -147,6 +147,9 @@ set CATALINA_OPTS=%CATALINA_OPTS% -Xmx1024m set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\bin </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/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml index 5fa7bcb..cc0714b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml @@ -68,5 +68,8 @@ ::Set the path for where zookeper config dir is ::set ZOOCFGDIR= </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/HDPWIN/2.1/services/STORM/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml index 3716b68..a329de7 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml @@ -39,5 +39,8 @@ <property> <name>content</name> <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/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml index 55f3eaf..dc15d6b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml @@ -31,5 +31,8 @@ <name>content</name> <description>This is the jinja template for tez-env.cmd file</description> <value></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/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml index f1445b2..315d326 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml @@ -52,5 +52,8 @@ <description>This is the jinja template for mapred-env.cmd file</description> <value> </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/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml index af4efca..d80d970 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml @@ -51,5 +51,8 @@ <description>This is the jinja template for yarn-env.cmd file</description> <value> </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/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml index 2ed40ac..c28a0d2 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml @@ -79,5 +79,8 @@ set JVMFLAGS=-Djava.net.preferIPv4Stack=true @rem Server specific JVM parameters @rem set SERVER_JVMFLAGS= </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/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml index d0a3b8b..6715917 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml @@ -123,6 +123,9 @@ set HADOOP_SECURE_DN_PID_DIR=%HADOOP_PID_DIR% set HADOOP_IDENT_STRING=%USERNAME% set HADOOP_NAMENODE_OPTS=-Xloggc:%HADOOP_LOG_DIR%/gc-namenode.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps %HADOOP_NAMENODE_OPTS% </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/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml index f627add..a6060d8 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml index 3d1b549..c207dbf 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml @@ -31,6 +31,9 @@ <name>content</name> <description>This is the jinja template for hive-env.sh file</description> <value></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/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml index aa33b0a..eb6d38b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml @@ -147,6 +147,9 @@ set CATALINA_OPTS=%CATALINA_OPTS% -Xmx1024m set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\bin </value> + <value-attributes> + <type>content</type> + </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml index 26f90c8..2f88e06 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml @@ -222,6 +222,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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml index 649472d..ef81d5d 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml @@ -194,6 +194,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/test/resources/stacks/HDP/1.3.4/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/configuration/hdfs-log4j.xml index 9e9f884..ef06453 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/configuration/hdfs-log4j.xml @@ -189,7 +189,10 @@ log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender # log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter - </value> + </value> + <value-attributes> + <type>content</type> + </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-conf.xml index 74a4c15..36de434 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-conf.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/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/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml index 33a2e93..4e34ba5 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml @@ -37,5 +37,8 @@ <value>flume</value> <property-type>USER</property-type> <description>Flume 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/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml index 74a4c15..36de434 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/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/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml index 33a2e93..4e34ba5 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml @@ -37,5 +37,8 @@ <value>flume</value> <property-type>USER</property-type> <description>Flume 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/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml index 8c6ac27..e2aee7f 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/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/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml index 480be75..9f86180 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml @@ -85,7 +85,10 @@ pig.location.check.strict=false hcat.bin=/usr/bin/hcat - </value> + </value> + <value-attributes> + <type>content</type> + </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml index 4677e57..d4cd34b 100644 --- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml @@ -221,6 +221,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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml index 649472d..9b5f166 100644 --- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml @@ -193,7 +193,10 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter # Removes "deprecated" messages log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN - </value> + </value> + <value-attributes> + <type>content</type> + </value-attributes> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-web/app/mappers/configs/stack_config_properties_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js index 7ed9193..87c43f7 100644 --- a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js +++ b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js @@ -103,8 +103,7 @@ App.stackConfigPropertiesMapper = App.QuickDataMapper.create({ if (!attributes) { config.StackConfigurations.property_value_attributes = {}; } - config.StackConfigurations.property_value_attributes.type = App.config.getDefaultDisplayType(config.StackConfigurations.property_name, - config.StackConfigurations.type, config.StackConfigurations.property_value, config.StackConfigurations.service_name); + config.StackConfigurations.property_value_attributes.type = App.config.getDefaultDisplayType(config.StackConfigurations.property_value); } // Map from /dependencies to property_depended_by config.StackConfigurations.property_depended_by = []; @@ -187,7 +186,6 @@ App.stackConfigPropertiesMapper = App.QuickDataMapper.create({ handleSpecialProperties: function(config) { if (!config.StackConfigurations.property_type.contains('ADDITIONAL_USER_PROPERTY')) { config.index = App.StackService.displayOrder.indexOf(config.StackConfigurations.service_name) + 1 || 30; - config.StackConfigurations.property_value_attributes.type = 'user'; } config.StackConfigurations.service_name = 'MISC'; config.category = 'Users and Groups'; http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 1fba4d0..b113a21 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -280,7 +280,7 @@ App.config = Em.Object.create({ supportsFinal: this.shouldSupportFinal(serviceName, fileName), serviceName: serviceName, displayName: name, - displayType: this.getDefaultDisplayType(name, fileName, coreObject ? coreObject.value : '', serviceName), + displayType: this.getDefaultDisplayType(coreObject ? coreObject.value : ''), description: '', category: this.getDefaultCategory(definedInStack, fileName), isSecureConfig: this.getIsSecure(name), @@ -380,24 +380,11 @@ App.config = Em.Object.create({ /** * Get displayType for properties that has not defined value - * @param name - * @param type * @param value - * @param serviceName * @returns {string} */ - getDefaultDisplayType: function(name, type, value, serviceName) { - if (serviceName && serviceName == 'FALCON' && this.getConfigTagFromFileName(type) == 'oozie-site') { - /** - * This specific type for 'oozie-site' configs of FALCON service. - * After this type will be moved to stack definition this hard-code should be removed - */ - return 'custom'; - } else if (name == 'content') { - return 'content'; - } else { - return value && !stringUtils.isSingleLine(value) ? 'multiLine' : 'string'; - } + getDefaultDisplayType: function(value) { + return value && !stringUtils.isSingleLine(value) ? 'multiLine' : 'string'; }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdf876c/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index e3906af..c90b758 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -644,17 +644,11 @@ describe('App.config', function () { }); describe('#getDefaultDisplayType', function() { - it('returns content displayType', function() { - expect(App.config.getDefaultDisplayType('content','f1','anything')).to.equal('content'); - }); it('returns singleLine displayType', function() { - expect(App.config.getDefaultDisplayType('n1','f1','v1')).to.equal('string'); + expect(App.config.getDefaultDisplayType('v1')).to.equal('string'); }); it('returns multiLine displayType', function() { - expect(App.config.getDefaultDisplayType('n2', 'f2', 'v1\nv2')).to.equal('multiLine'); - }); - it('returns custom displayType for FALCON oozie-site properties', function() { - expect(App.config.getDefaultDisplayType('n2', 'oozie-site.xml', 'v1\nv2', 'FALCON')).to.equal('custom'); + expect(App.config.getDefaultDisplayType('v1\nv2')).to.equal('multiLine'); }); }); @@ -815,7 +809,7 @@ describe('App.config', function () { expect(App.config.createDefaultConfig('pName', 'pServiceName', 'pFileName', true)).to.eql(res); }); it('runs proper methods', function() { - expect(App.config.getDefaultDisplayType.calledWith('pName', 'pFileName', '')).to.be.true; + expect(App.config.getDefaultDisplayType.called).to.be.true; expect(App.config.getDefaultCategory.calledWith(true, 'pFileName')).to.be.true; expect(App.config.getIsSecure.calledWith('pName')).to.be.true; expect(App.config.shouldSupportFinal.calledWith('pServiceName', 'pFileName')).to.be.true;