You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/08/15 16:22:45 UTC
git commit: AMBARI-6875 Missing configs from HDFS service
configuration download. (Dmytro Shkvyra via dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 13ed07199 -> a10f42a7a
AMBARI-6875 Missing configs from HDFS service configuration download. (Dmytro Shkvyra via dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a10f42a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a10f42a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a10f42a7
Branch: refs/heads/trunk
Commit: a10f42a7a00a9dc5947e26c78d34af9cdcc6ca1e
Parents: 13ed071
Author: Dmytro Sen <ds...@hortonworks.com>
Authored: Fri Aug 15 17:22:32 2014 +0300
Committer: Dmytro Sen <ds...@hortonworks.com>
Committed: Fri Aug 15 17:22:32 2014 +0300
----------------------------------------------------------------------
.../libraries/providers/xml_config.py | 6 +++---
.../services/GLUSTERFS/metainfo.xml | 12 ++++++++++++
.../stacks/HDP/1.3.2/services/HBASE/metainfo.xml | 5 +++++
.../stacks/HDP/1.3.2/services/HDFS/metainfo.xml | 16 +++++++++++++---
.../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 10 ++++++++++
.../HDP/1.3.2/services/MAPREDUCE/metainfo.xml | 7 ++++++-
.../stacks/HDP/1.3.2/services/OOZIE/metainfo.xml | 5 +++++
.../stacks/HDP/1.3.2/services/PIG/metainfo.xml | 5 +++++
.../HDP/1.3.2/services/ZOOKEEPER/metainfo.xml | 5 +++++
.../services/GLUSTERFS/metainfo.xml | 12 ++++++++++++
.../HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml | 17 +++++++++++++++++
.../stacks/HDP/2.0.6/services/HBASE/metainfo.xml | 5 +++++
.../stacks/HDP/2.0.6/services/HDFS/metainfo.xml | 10 ++++++++++
.../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 11 +++++++++++
.../stacks/HDP/2.0.6/services/OOZIE/metainfo.xml | 5 +++++
.../services/PIG/configuration/pig-properties.xml | 2 +-
.../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 17 +++++++++++++++++
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 15 +++++++++++++++
.../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 5 +++++
.../services/PIG/configuration/pig-properties.xml | 2 +-
.../services/PIG/configuration/pig-properties.xml | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 2 +-
22 files changed, 165 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index d6ef1cc..87fc657 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -26,7 +26,7 @@ from resource_management import *
class XmlConfigProvider(Provider):
def action_create(self):
filename = self.resource.filename
- conf_dir = self.resource.conf_dir
+ xml_config_provider_config_dir = self.resource.conf_dir
# |e - for html-like escaping of <,>,',"
config_content = InlineTemplate('''<!--{{time.asctime(time.localtime())}}-->
@@ -50,10 +50,10 @@ class XmlConfigProvider(Provider):
configuration_attrs=self.resource.configuration_attributes)
- Logger.info(format("Generating config: {conf_dir}/{filename}"))
+ Logger.info(format("Generating config: {xml_config_provider_config_dir}/{filename}"))
with Environment.get_instance_copy() as env:
- File (format("{conf_dir}/{filename}"),
+ File (format("{xml_config_provider_config_dir}/{filename}"),
content = config_content,
owner = self.resource.owner,
group = self.resource.group,
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/metainfo.xml
index 1aa4d96..84daf77 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/metainfo.xml
@@ -31,6 +31,18 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>core-site.xml</fileName>
+ <dictionaryName>core-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>xml</type>
+ <fileName>hdfs-site.xml</fileName>
+ <dictionaryName>hdfs-site</dictionaryName>
+ </configFile>
+ </configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
index 0f9abfa..d1e8795 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
@@ -102,6 +102,11 @@
<fileName>hbase-env.sh</fileName>
<dictionaryName>hbase-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hbase-log4j.properties</fileName>
+ <dictionaryName>hbase-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
index 6b54182..c453905 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
@@ -83,10 +83,20 @@
<dictionaryName>hdfs-site</dictionaryName>
</configFile>
<configFile>
+ <type>xml</type>
+ <fileName>core-site.xml</fileName>
+ <dictionaryName>core-site</dictionaryName>
+ </configFile>
+ <configFile>
<type>env</type>
- <fileName>hdfs-env.sh</fileName>
- <dictionaryName>hdfs-env</dictionaryName>
- </configFile>
+ <fileName>hadoop-env.sh</fileName>
+ <dictionaryName>hadoop-env</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hdfs-log4j.properties</fileName>
+ <dictionaryName>hdfs-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
index afd2f74..c1263d5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
@@ -95,6 +95,16 @@
<fileName>hive-env.sh</fileName>
<dictionaryName>hive-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-log4j.properties</fileName>
+ <dictionaryName>hive-log4j</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-exec-log4j.properties</fileName>
+ <dictionaryName>hive-exec-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml
index e97ac4f..a900f2e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/metainfo.xml
@@ -75,12 +75,17 @@
<type>xml</type>
<fileName>mapred-site.xml</fileName>
<dictionaryName>mapred-site</dictionaryName>
- </configFile>
+ </configFile>
<configFile>
<type>env</type>
<fileName>mapred-env.sh</fileName>
<dictionaryName>mapred-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>mapreduce-log4j.properties</fileName>
+ <dictionaryName>mapreduce-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
index 23c697e..4e83703 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
@@ -86,6 +86,11 @@
<fileName>oozie-env.sh</fileName>
<dictionaryName>oozie-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>oozie-log4j.properties</fileName>
+ <dictionaryName>oozie-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
index 651f192..e7f0cad 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
@@ -38,6 +38,11 @@
<fileName>pig-env.sh</fileName>
<dictionaryName>pig-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>pig-log4j.properties</fileName>
+ <dictionaryName>pig-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
index 3f722a1..3db40c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
@@ -49,6 +49,11 @@
<fileName>zookeeper-env.sh</fileName>
<dictionaryName>zookeeper-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>zookeeper-log4j.properties</fileName>
+ <dictionaryName>zookeeper-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
index 1aa4d96..37069e5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/metainfo.xml
@@ -31,6 +31,18 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>global.xml</fileName>
+ <dictionaryName>global</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>xml</type>
+ <fileName>core-site.xml</fileName>
+ <dictionaryName>core-site</dictionaryName>
+ </configFile>
+ </configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
index edada64..9768a1f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metainfo.xml
@@ -31,6 +31,23 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>global.xml</fileName>
+ <dictionaryName>global</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>xml</type>
+ <fileName>core-site.xml</fileName>
+ <dictionaryName>core-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>xml</type>
+ <fileName>hdfs-site.xml</fileName>
+ <dictionaryName>hdfs-site</dictionaryName>
+ </configFile>
+ </configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
index b28857c..c63b2b8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
@@ -92,6 +92,11 @@
<fileName>hbase-env.sh</fileName>
<dictionaryName>hbase-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hbase-log4j.properties</fileName>
+ <dictionaryName>hbase-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
index 3d30e07..62b7cd8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
@@ -92,6 +92,16 @@
<dictionaryName>hdfs-site</dictionaryName>
</configFile>
<configFile>
+ <type>xml</type>
+ <fileName>core-site.xml</fileName>
+ <dictionaryName>core-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hdfs-log4j.properties</fileName>
+ <dictionaryName>hdfs-log4j</dictionaryName>
+ </configFile>
+ <configFile>
<type>env</type>
<fileName>hadoop-env.sh</fileName>
<dictionaryName>hadoop-env</dictionaryName>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
index 5433c8a..eecc292 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
@@ -102,6 +102,16 @@
<fileName>hive-env.sh</fileName>
<dictionaryName>hive-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-log4j.properties</fileName>
+ <dictionaryName>hive-log4j</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-exec-log4j.properties</fileName>
+ <dictionaryName>hive-exec-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
@@ -154,6 +164,7 @@
<config-type>hive-site</config-type>
<config-type>hive-log4j</config-type>
<config-type>hive-exec-log4j</config-type>
+ <config-type>hive-env</config-type>
</configuration-dependencies>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
index d2fd90f..bdc83ea 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
@@ -93,6 +93,11 @@
<fileName>oozie-env.sh</fileName>
<dictionaryName>oozie-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>oozie-log4j.properties</fileName>
+ <dictionaryName>oozie-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/configuration/pig-properties.xml
index d9b582e..59cc0c4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/configuration/pig-properties.xml
@@ -23,7 +23,7 @@
<configuration supports_final="false">
<property>
- <name>pig-content</name>
+ <name>content</name>
<description>Describe all the Pig agent configurations</description>
<value>
# Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
index 0288290..48b42f1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
@@ -32,6 +32,23 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <configFiles>
+ <configFile>
+ <type>env</type>
+ <fileName>pig-env.sh</fileName>
+ <dictionaryName>pig-env</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>pig-log4j.properties</fileName>
+ <dictionaryName>pig-log4j</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>pig-properties.properties</fileName>
+ <dictionaryName>pig-properties</dictionaryName>
+ </configFile>
+ </configFiles>
</component>
</components>
<osSpecifics>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
index 6bc5d9a..a2ef433 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
@@ -93,6 +93,16 @@
<fileName>yarn-env.sh</fileName>
<dictionaryName>yarn-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>yarn-log4j.properties</fileName>
+ <dictionaryName>yarn-log4j</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>xml</type>
+ <fileName>capacity-scheduler.xml</fileName>
+ <dictionaryName>capacity-scheduler</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
@@ -181,6 +191,11 @@
<fileName>yarn-env.sh</fileName>
<dictionaryName>yarn-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>yarn-log4j.properties</fileName>
+ <dictionaryName>yarn-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
index d11e081..a259351 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
@@ -49,6 +49,11 @@
<fileName>zookeeper-env.sh</fileName>
<dictionaryName>zookeeper-env</dictionaryName>
</configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>zookeeper-log4j.properties</fileName>
+ <dictionaryName>zookeeper-log4j</dictionaryName>
+ </configFile>
</configFiles>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/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 63b99e2..480be75 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
@@ -23,7 +23,7 @@
<configuration supports_final="false">
<property>
- <name>pig-content</name>
+ <name>content</name>
<value>
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/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 63b99e2..480be75 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
@@ -23,7 +23,7 @@
<configuration supports_final="false">
<property>
- <name>pig-content</name>
+ <name>content</name>
<value>
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a10f42a7/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index a539f81..43cd076 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1586,7 +1586,7 @@ module.exports =
/**********************************************pig.properties*****************************************/
{
"id": "site property",
- "name": "pig-content",
+ "name": "content",
"displayName": "content",
"value": "",
"defaultValue": "",