You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sc...@apache.org on 2015/06/03 15:38:44 UTC

[1/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Repository: ambari
Updated Branches:
  refs/heads/trunk e06e19c8f -> 627401f6e


http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/ZOOKEEPER/metainfo.xml
deleted file mode 100644
index 42be202..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/ZOOKEEPER/metainfo.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>ZOOKEEPER</name>
-      <displayName>ZooKeeper</displayName>
-      <version>3.4.6.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>zookeeper_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>zookeeper-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/upgrades/upgrade-2.2.xml
deleted file mode 100644
index f8351eb..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/upgrades/upgrade-2.2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <target>2.2.*.*</target>
-  <order>
-    <service name="ZOOKEEPER">
-      <component>ZOOKEEPER_SERVER</component>
-      <component>ZOOKEEPER_CLIENT</component>
-    </service>
-    <service name="HDFS">
-      <component>JOURNALNODE</component>
-      <component>NAMENODE</component>
-      <component>DATANODE</component>
-    </service>
-  </order>
-  <processing>
-    <service name="ZOOKEEPER">
-      <component name="ZOOKEEPER_SERVER">
-        <batch xsi:type="count">
-          <count>1</count>
-        </batch>
-      </component>
-    </service>
-  </processing>
-</upgrade>


[7/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
AMBARI-10446 Remove 2.2.GlusterFS stack


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/627401f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/627401f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/627401f6

Branch: refs/heads/trunk
Commit: 627401f6e6e4091529d67bc6d8188a44d010e282
Parents: e06e19c
Author: Scott Creeley <sc...@redhat.com>
Authored: Wed Jun 3 09:36:42 2015 -0400
Committer: Scott Creeley <sc...@redhat.com>
Committed: Wed Jun 3 09:38:10 2015 -0400

----------------------------------------------------------------------
 .../2.2.GlusterFS/configuration/cluster-env.xml |   56 -
 .../stacks/HDP/2.2.GlusterFS/metainfo.xml       |   23 -
 .../stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml |   68 -
 .../HDP/2.2.GlusterFS/role_command_order.json   |   79 -
 .../2.2.GlusterFS/services/FLUME/metainfo.xml   |   47 -
 .../GLUSTERFS/configuration/core-site.xml       |   41 -
 .../GLUSTERFS/configuration/hadoop-env.xml      |  194 --
 .../services/GLUSTERFS/metainfo.xml             |   74 -
 .../GLUSTERFS/package/scripts/glusterfs.py      |   29 -
 .../package/scripts/glusterfs_client.py         |   34 -
 .../GLUSTERFS/package/scripts/params.py         |   29 -
 .../GLUSTERFS/package/scripts/service_check.py  |   37 -
 .../package/templates/glusterfs-env.sh.j2       |   38 -
 .../package/templates/glusterfs.properties.j2   |   36 -
 .../services/HBASE/configuration/hbase-site.xml |   65 -
 .../2.2.GlusterFS/services/HBASE/metainfo.xml   |   47 -
 .../services/HIVE/configuration/hive-env.xml    |   64 -
 .../services/HIVE/configuration/hive-site.xml   | 1119 --------
 .../HIVE/configuration/webhcat-site.xml         |  112 -
 .../2.2.GlusterFS/services/HIVE/metainfo.xml    |   88 -
 .../2.2.GlusterFS/services/KAFKA/alerts.json    |   31 -
 .../KAFKA/configuration/kafka-broker.xml        |  321 ---
 .../services/KAFKA/configuration/kafka-env.xml  |   55 -
 .../KAFKA/configuration/kafka-log4j.xml         |  116 -
 .../2.2.GlusterFS/services/KAFKA/metainfo.xml   |   82 -
 .../2.2.GlusterFS/services/KAFKA/metrics.json   |  264 --
 .../services/KAFKA/package/scripts/kafka.py     |   70 -
 .../KAFKA/package/scripts/kafka_broker.py       |   63 -
 .../services/KAFKA/package/scripts/params.py    |   58 -
 .../KAFKA/package/scripts/properties_config.py  |   32 -
 .../KAFKA/package/scripts/service_check.py      |   65 -
 .../KAFKA/package/scripts/status_params.py      |   26 -
 .../KERBEROS/configuration/kadm5-acl.xml        |   36 -
 .../KERBEROS/configuration/kdc-conf.xml         |   57 -
 .../KERBEROS/configuration/kerberos-env.xml     |  111 -
 .../KERBEROS/configuration/krb5-conf.xml        |  106 -
 .../services/KERBEROS/metainfo.xml              |  175 --
 .../KERBEROS/package/scripts/kerberos_client.py |   44 -
 .../KERBEROS/package/scripts/kerberos_common.py |  419 ---
 .../KERBEROS/package/scripts/kerberos_server.py |  144 -
 .../services/KERBEROS/package/scripts/params.py |  189 --
 .../KERBEROS/package/scripts/service_check.py   |   63 -
 .../services/KERBEROS/package/scripts/utils.py  |   69 -
 .../KERBEROS/package/templates/kadm5_acl.j2     |   20 -
 .../KERBEROS/package/templates/kdc_conf.j2      |   30 -
 .../KERBEROS/package/templates/krb5_conf.j2     |   46 -
 .../HDP/2.2.GlusterFS/services/KNOX/alerts.json |   31 -
 .../KNOX/configuration/gateway-log4j.xml        |   83 -
 .../KNOX/configuration/gateway-site.xml         |   72 -
 .../services/KNOX/configuration/knox-env.xml    |   53 -
 .../services/KNOX/configuration/ldap-log4j.xml  |   66 -
 .../services/KNOX/configuration/topology.xml    |  116 -
 .../services/KNOX/configuration/users-ldif.xml  |  135 -
 .../2.2.GlusterFS/services/KNOX/metainfo.xml    |   87 -
 .../KNOX/package/files/validateKnoxStatus.py    |   43 -
 .../services/KNOX/package/scripts/knox.py       |   74 -
 .../KNOX/package/scripts/knox_gateway.py        |  101 -
 .../services/KNOX/package/scripts/knox_ldap.py  |   39 -
 .../services/KNOX/package/scripts/params.py     |  140 -
 .../KNOX/package/scripts/service_check.py       |   58 -
 .../KNOX/package/scripts/status_params.py       |   27 -
 .../package/templates/krb5JAASLogin.conf.j2     |   30 -
 .../services/OOZIE/configuration/oozie-env.xml  |  101 -
 .../services/OOZIE/configuration/oozie-site.xml |  107 -
 .../2.2.GlusterFS/services/OOZIE/metainfo.xml   |   70 -
 .../HDP/2.2.GlusterFS/services/PIG/metainfo.xml |   48 -
 .../SLIDER/configuration/slider-client.xml      |   60 -
 .../SLIDER/configuration/slider-env.xml         |   43 -
 .../SLIDER/configuration/slider-log4j.xml       |   89 -
 .../2.2.GlusterFS/services/SLIDER/metainfo.xml  |  132 -
 .../SLIDER/package/files/hbaseSmokeVerify.sh    |   34 -
 .../services/SLIDER/package/scripts/__init__.py |   19 -
 .../services/SLIDER/package/scripts/params.py   |   49 -
 .../SLIDER/package/scripts/service_check.py     |   45 -
 .../services/SLIDER/package/scripts/slider.py   |   62 -
 .../SLIDER/package/scripts/slider_client.py     |   43 -
 .../package/templates/storm-slider-env.sh.j2    |   38 -
 .../2.2.GlusterFS/services/SQOOP/metainfo.xml   |   52 -
 .../services/TEZ/configuration/tez-site.xml     |  311 ---
 .../HDP/2.2.GlusterFS/services/TEZ/metainfo.xml |   47 -
 .../YARN/configuration-mapred/mapred-env.xml    |   46 -
 .../YARN/configuration-mapred/mapred-site.xml   |  173 --
 .../YARN/configuration-mapred/ssl-client.xml    |   58 -
 .../YARN/configuration-mapred/ssl-server.xml    |   58 -
 .../YARN/configuration/capacity-scheduler.xml   |  131 -
 .../YARN/configuration/mapred-site.xml.2        |   68 -
 .../services/YARN/configuration/yarn-site.xml   |  565 ----
 .../2.2.GlusterFS/services/YARN/metainfo.xml    |   83 -
 .../2.2.GlusterFS/services/YARN/metrics.json    | 2548 ------------------
 .../services/ZOOKEEPER/metainfo.xml             |   46 -
 .../HDP/2.2.GlusterFS/upgrades/upgrade-2.2.xml  |   40 -
 91 files changed, 11293 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/configuration/cluster-env.xml
deleted file mode 100644
index d41ff98..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/configuration/cluster-env.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-    <property>
-        <name>security_enabled</name>
-        <value>false</value>
-        <description>Hadoop Security</description>
-    </property>
-    <property>
-        <name>kerberos_domain</name>
-        <value>EXAMPLE.COM</value>
-        <description>Kerberos realm.</description>
-    </property>
-    <property>
-        <name>ignore_groupsusers_create</name>
-        <value>false</value>
-        <description>Whether to ignore failures on users and group creation</description>
-    </property>
-    <property>
-        <name>smokeuser</name>
-        <value>ambari-qa</value>
-        <property-type>USER</property-type>
-        <description>User executing service checks</description>
-    </property>
-    <property>
-        <name>smokeuser_keytab</name>
-        <value>/etc/security/keytabs/smokeuser.headless.keytab</value>
-        <description>Path to smoke test user keytab file</description>
-    </property>
-    <property>
-        <name>user_group</name>
-        <value>hadoop</value>
-        <property-type>GROUP</property-type>
-        <description>Hadoop user group.</description>
-    </property>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/metainfo.xml
deleted file mode 100644
index 39ec8e7..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/metainfo.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-    <versions>
-	  <active>false</active>
-    </versions>
-    <extends>2.1</extends>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml
deleted file mode 100644
index 66897d5..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/repos/repoinfo.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<reposinfo>
-  <latest>http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json</latest>
-  <os family="redhat6">
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl>
-      <repoid>HDP-2.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
-  <os family="redhat5">
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0</baseurl>
-      <repoid>HDP-2.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
-  <os family="suse11">
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/sles11sp1/2.x/updates/2.2.0.0</baseurl>
-      <repoid>HDP-2.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp3</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
-  <os family="ubuntu12">
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/BUILDS/2.2.0.0-962</baseurl>
-      <repoid>HDP-2.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
-</reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/role_command_order.json
deleted file mode 100644
index 72b49fa..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/role_command_order.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "_comment" : "Record format:",
-  "_comment" : "blockedRole-blockedCommand: [blockerRole1-blockerCommand1, blockerRole2-blockerCommand2, ...]",
-  "general_deps" : {
-    "_comment" : "dependencies for all cases",
-    "NIMBUS-START" : ["ZOOKEEPER_SERVER-START", "NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "SUPERVISOR-START" : ["NIMBUS-START"],
-    "STORM_UI_SERVER-START" : ["NIMBUS-START"],
-    "DRPC_SERVER-START" : ["NIMBUS-START"],
-    "STORM_REST_API-START" : ["NIMBUS-START", "STORM_UI_SERVER-START", "SUPERVISOR-START", "DRPC_SERVER-START"],
-    "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START"],
-    "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
-    "OOZIE_SERVER-START": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "WEBHCAT_SERVER-START": ["NODEMANAGER-START", "HIVE_SERVER-START"],
-    "HIVE_METASTORE-START": ["MYSQL_SERVER-START"],
-    "HIVE_SERVER-START": ["NODEMANAGER-START", "MYSQL_SERVER-START"],
-    "HUE_SERVER-START": ["HIVE_SERVER-START", "HCAT-START", "OOZIE_SERVER-START"],
-    "FLUME_HANDLER-START": ["OOZIE_SERVER-START"],
-    "FALCON_SERVER-START": ["NAMENODE-START", "DATANODE-START", "OOZIE_SERVER-START"],
-    "MAPREDUCE_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START"],
-    "WEBHCAT_SERVICE_CHECK-SERVICE_CHECK": ["WEBHCAT_SERVER-START"],
-    "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"],
-    "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START", "WEBHCAT_SERVER-START"],
-    "HCAT_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START"],
-    "PIG_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "ZOOKEEPER_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"],
-    "ZOOKEEPER_QUORUM_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"],
-    "STORM_SERVICE_CHECK-SERVICE_CHECK": ["NIMBUS-START", "SUPERVISOR-START", "STORM_UI_SERVER-START",
-        "DRPC_SERVER-START"],
-    "FLUME_SERVICE_CHECK-SERVICE_CHECK": ["FLUME_HANDLER-START"],
-    "FALCON_SERVICE_CHECK-SERVICE_CHECK": ["FALCON_SERVER-START"],
-    "SLIDER_SERVICE_CHECK-SERVICE_CHECK" : ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "KAFKA_BROKER-START" : ["ZOOKEEPER_SERVER-START"],
-    "KAFKA_SERVICE_CHECK-SERVICE_CHECK": ["KAFKA_BROKER-START"],
-    "ZOOKEEPER_SERVER-STOP" : ["HBASE_MASTER-STOP", "HBASE_REGIONSERVER-STOP"],
-    "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
-    "NIMBUS-STOP" : ["SUPERVISOR-STOP", "STORM_UI_SERVER-STOP", "DRPC_SERVER-STOP"]
-  },
-  "_comment" : "GLUSTERFS-specific dependencies",
-  "optional_glusterfs": {
-    "HBASE_MASTER-START": ["PEERSTATUS-START"],
-    "GLUSTERFS_SERVICE_CHECK-SERVICE_CHECK": ["PEERSTATUS-START"]
-  },
-  "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster",
-  "optional_no_glusterfs": {
-    "SECONDARY_NAMENODE-START": ["NAMENODE-START"],
-    "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"],
-    "NODEMANAGER-START": ["NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START"],
-    "HISTORYSERVER-START": ["NAMENODE-START", "DATANODE-START"],
-    "HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START"],
-    "APP_TIMELINE_SERVER-START": ["NAMENODE-START", "DATANODE-START"],
-    "FALCON_SERVER-START": ["NAMENODE-START", "DATANODE-START"],
-    "FALCON_SERVICE_CHECK-SERVICE_CHECK": ["FALCON_SERVER-START"],
-    "HIVE_SERVER-START": ["DATANODE-START"],
-    "WEBHCAT_SERVER-START": ["DATANODE-START"],
-    "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["NAMENODE-START", "DATANODE-START",
-        "SECONDARY_NAMENODE-START"],
-    "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START",
-        "RESOURCEMANAGER-START", "HISTORYSERVER-START", "YARN_SERVICE_CHECK-SERVICE_CHECK"],
-    "YARN_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
-    "RESOURCEMANAGER_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START"],
-    "PIG_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START", "NODEMANAGER-START"],
-    "NAMENODE-STOP": ["RESOURCEMANAGER-STOP", "NODEMANAGER-STOP",
-        "HISTORYSERVER-STOP", "HBASE_MASTER-STOP", "FALCON_SERVER-STOP"],
-    "DATANODE-STOP": ["RESOURCEMANAGER-STOP", "NODEMANAGER-STOP",
-        "HISTORYSERVER-STOP", "HBASE_MASTER-STOP", "FALCON_SERVER-STOP"]
-  },
-  "_comment" : "Dependencies that are used in HA NameNode cluster",
-  "namenode_optional_ha": {
-    "NAMENODE-START": ["ZKFC-START", "JOURNALNODE-START", "ZOOKEEPER_SERVER-START"],
-    "ZKFC-START": ["ZOOKEEPER_SERVER-START"]
-  },
-  "_comment" : "Dependencies that are used in ResourceManager HA cluster",
-  "resourcemanager_optional_ha" : {
-    "RESOURCEMANAGER-START": ["ZOOKEEPER_SERVER-START"]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/FLUME/metainfo.xml
deleted file mode 100644
index c5b38b3..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/FLUME/metainfo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>FLUME</name>
-      <displayName>Flume</displayName>
-      <version>1.5.2.2.2.0.0</version>
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>flume_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>flume-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
deleted file mode 100644
index 7794ac8..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
- <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
- 
-        http://www.apache.org/licenses/LICENSE-2.0
- 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
- 
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<!-- file system properties -->
-
-  <property>
-  <name>fs.AbstractFileSystem.glusterfs.impl</name>
-  <value>org.apache.hadoop.fs.local.GlusterFs</value>
-  </property>
-
-  <property>
-  <name>fs.glusterfs.impl</name>
-  <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
-  </property>
-
-  <property>
-    <name>fs.defaultFS</name>
-    <value>glusterfs:///localhost:8020</value>
-  </property>  
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
deleted file mode 100644
index bce6b53..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-  <property>
-    <name>hadoop_pid_dir_prefix</name>
-    <value>/var/run/hadoop</value>
-    <description>Hadoop PID Dir Prefix</description>
-  </property>
- <property>
-    <name>hadoop_heapsize</name>
-    <value>1024</value>
-    <description>Hadoop maximum Java heap size</description>
-  </property>
-  <property>
-    <name>glusterfs_user</name>
-    <value>root</value>
-    <description></description>
-  </property>
-  <property>
-    <name>hdfs_log_dir_prefix</name>
-    <value>/var/log/hadoop</value>
-    <description>Hadoop Log Dir Prefix</description>
-  </property>
-  <property>
-    <name>namenode_heapsize</name>
-    <value>1024</value>
-    <description>NameNode Java heap size</description>
-  </property>
-  <property>
-    <name>namenode_host</name>
-    <value></value>
-    <description>NameNode Host.</description>
-  </property>
-  <property>
-    <name>snamenode_host</name>
-    <value></value>
-    <description>Secondary NameNode.</description>
-  </property>
-  <property>
-    <name>proxyuser_group</name>
-    <value>users</value>
-    <description>Proxy user group.</description>
-  </property>
-  <property>
-    <name>hdfs_user</name>
-    <value>hdfs</value>
-    <description>User to run HDFS as</description>
-  </property>
-  <!--
-  <property>
-    <name>user_group</name>
-    <value>hadoop</value>
-    <description>Proxy user group.</description>
-  </property>
-  -->
-    <!-- hadoop-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for hadoop-env.sh file</description>
-    <value>
-# Set Hadoop-specific environment variables here.
-
-# The only required environment variable is JAVA_HOME.  All others are
-# optional.  When running a distributed configuration it is best to
-# set JAVA_HOME in this file, so that it is correctly defined on
-# remote nodes.
-
-# The java implementation to use.  Required.
-export JAVA_HOME={{java_home}}
-export HADOOP_HOME_WARN_SUPPRESS=1
-
-# Hadoop home directory
-export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
-
-# Hadoop Configuration Directory
-#TODO: if env var set that can cause problems
-export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}
-
-{# this is different for HDP1 #}
-# Path to jsvc required by secure HDP 2.0 datanode
-export JSVC_HOME={{jsvc_path}}
-
-
-# The maximum amount of heap to use, in MB. Default is 1000.
-export HADOOP_HEAPSIZE="{{hadoop_heapsize}}"
-
-export HADOOP_NAMENODE_INIT_HEAPSIZE="-Xms{{namenode_heapsize}}"
-
-# Extra Java runtime options.  Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
-
-# Command specific options appended to HADOOP_OPTS when specified
-export HADOOP_NAMENODE_OPTS="-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log -XX:NewSize={{namenode_opt_newsize}} -XX:MaxNewSize={{namenode_opt_maxnewsize}} -XX:PermSize={{namenode_opt_permsize}} -XX:MaxPermSize={{namenode_opt_maxpermsize}} -Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xms{{namenode_heapsize}} -Xmx{{namenode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"
-HADOOP_JOBTRACKER_OPTS="-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log -XX:NewSize={{jtnode_opt_newsize}} -XX:MaxNewSize={{jtnode_opt_maxnewsize}} -Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xmx{{jtnode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dmapred.audit.logger=INFO,MRAUDIT -Dhadoop.mapreduce.jobsummary.logger=INFO,JSA ${HADOOP_JOBTRACKER_OPTS}"
-
-HADOOP_TASKTRACKER_OPTS="-server -Xmx{{ttnode_heapsize}} -Dhadoop.security.logger=ERROR,console -Dmapred.audit.logger=ERROR,console ${HADOOP_TASKTRACKER_OPTS}"
-HADOOP_DATANODE_OPTS="-Xmx{{dtnode_heapsize}} -Dhadoop.security.logger=ERROR,DRFAS ${HADOOP_DATANODE_OPTS}"
-HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m ${HADOOP_BALANCER_OPTS}"
-
-export HADOOP_SECONDARYNAMENODE_OPTS="-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log -XX:NewSize={{namenode_opt_newsize}} -XX:MaxNewSize={{namenode_opt_maxnewsize}} -XX:PermSize={{namenode_opt_permsize}} -XX:MaxPermSize={{namenode_opt_maxpermsize}} -Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE} -Xmx{{namenode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_SECONDARYNAMENODE_OPTS}"
-
-# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
-# On secure datanodes, user to run the datanode as after dropping privileges
-export HADOOP_SECURE_DN_USER=${HADOOP_SECURE_DN_USER:-{{hadoop_secure_dn_user}}}
-
-# Extra ssh options.  Empty by default.
-export HADOOP_SSH_OPTS="-o ConnectTimeout=5 -o SendEnv=HADOOP_CONF_DIR"
-
-# Where log files are stored.  $HADOOP_HOME/logs by default.
-export HADOOP_LOG_DIR={{hdfs_log_dir_prefix}}/$USER
-
-# History server logs
-export HADOOP_MAPRED_LOG_DIR={{mapred_log_dir_prefix}}/$USER
-
-# Where log files are stored in the secure data environment.
-export HADOOP_SECURE_DN_LOG_DIR={{hdfs_log_dir_prefix}}/$HADOOP_SECURE_DN_USER
-
-# File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.
-# export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves
-
-# host:path where hadoop code should be rsync'd from.  Unset by default.
-# export HADOOP_MASTER=master:/home/$USER/src/hadoop
-
-# Seconds to sleep between slave commands.  Unset by default.  This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HADOOP_SLAVE_SLEEP=0.1
-
-# The directory where pid files are stored. /tmp by default.
-export HADOOP_PID_DIR={{hadoop_pid_dir_prefix}}/$USER
-export HADOOP_SECURE_DN_PID_DIR={{hadoop_pid_dir_prefix}}/$HADOOP_SECURE_DN_USER
-
-# History server pid
-export HADOOP_MAPRED_PID_DIR={{mapred_pid_dir_prefix}}/$USER
-
-YARN_RESOURCEMANAGER_OPTS="-Dyarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY"
-
-# A string representing this instance of hadoop. $USER by default.
-export HADOOP_IDENT_STRING=$USER
-
-# The scheduling priority for daemon processes.  See 'man nice'.
-
-# export HADOOP_NICENESS=10
-
-# Use libraries from standard classpath
-JAVA_JDBC_LIBS=""
-#Add libraries required by mysql connector
-for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null`
-do
-  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
-done
-#Add libraries required by oracle connector
-for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null`
-do
-  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
-done
-#Add libraries required by nodemanager
-MAPREDUCE_LIBS={{mapreduce_libs_path}}
-export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}
-
-if [ -d "/usr/lib/tez" ]; then
-  export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:/usr/lib/tez/*:/usr/lib/tez/lib/*:/etc/tez/conf
-fi
-
-# Setting path to hdfs command line
-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>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/metainfo.xml
deleted file mode 100644
index 2a6c16e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/metainfo.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>GLUSTERFS</name>
-      <displayName>GLUSTERFS</displayName>
-      <comment>An Hadoop Compatible File System</comment>
-      <version>2.1.3.0</version>
-      <components>
-        <component>
-          <name>GLUSTERFS_CLIENT</name>
-          <category>CLIENT</category>
-          <commandScript>
-            <script>scripts/glusterfs_client.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-            <configFile>
-              <type>xml</type>
-              <fileName>core-site.xml</fileName>
-              <dictionaryName>core-site</dictionaryName>
-            </configFile>                       
-            <configFile>
-              <type>env</type>
-              <fileName>hadoop-env.sh</fileName>
-              <dictionaryName>hadoop-env</dictionaryName>
-            </configFile>          
-        </component>
-      </components>
-<!--
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any<osFamily>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>glusterfs</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
--->
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-
-      <configuration-dependencies>
-        <config-type>core-site</config-type>
-        <config-type>hadoop-env</config-type>
-        <!--<config-type>hdfs-site</config-type>-->
-      </configuration-dependencies>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs.py
deleted file mode 100644
index 8b64c6a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-from resource_management import *
-
-def glusterfs():
-  import params
-
-  Directory( params.glusterfs_conf_dir
-  )
-
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs_client.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs_client.py
deleted file mode 100644
index 840c76c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/glusterfs_client.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import sys
-from resource_management import *
-from glusterfs import glusterfs
-
-class GlusterFSClient(Script):
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    glusterfs()
-
-  def status(self, env):
-    raise ClientComponentHasNoStatus()
-
-if __name__ == "__main__":
-  GlusterFSClient().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/params.py
deleted file mode 100644
index 6d88109..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/params.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-config = Script.get_config()
-
-
-#glusterfs_home = '/usr/lib/glusterfs'
-glusterfs_conf_dir = '/etc/glusterfs'
-log_dir = '/var/log/glusterfs'
-java64_home = config['hostLevelParams']['java_home']
-hadoop_home = "/usr"

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/service_check.py
deleted file mode 100644
index 6619a73..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/scripts/service_check.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-
-class GlusterFSServiceCheck(Script):
-  def service_check(self, env):
-    import params
-    env.set_params(params)
-
-    Execute(format("env  GLUSTERFS_LOG_DIR=/var/log/glusterfs "
-                   "GLUSTERFS_PID_DIR=/var/run/glusterfs "
-                   "glusterd --version"),
-            logoutput=True,
-            tries = 3,
-            try_sleep = 20
-    )
-
-if __name__ == "__main__":
-  GlusterFSServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs-env.sh.j2
deleted file mode 100644
index eda6de7..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs-env.sh.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-
-
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-JAVA_HOME={{java64_home}}
-HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs.properties.j2
deleted file mode 100644
index 1bf6e1d..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/GLUSTERFS/package/templates/glusterfs.properties.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-#
-
-# GlusterFS configuration file. All values can be overwritten by command line arguments.
-
-
-
-# load jarfile, colon separated
-#jar=/usr/lib/hadoop/lib
-
-#verbose print all log messages to screen (default to print only INFO and above to screen)
-#verbose=true
-
-#exectype local|mapreduce, mapreduce is default
-#exectype=mapreduce
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/configuration/hbase-site.xml
deleted file mode 100644
index e5b893f..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/configuration/hbase-site.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-  <property>
-    <name>hbase.hstore.flush.retries.number</name>
-    <value>120</value>
-    <deleted>true</deleted>
-    <description>
-    The number of times the region flush operation will be retried.
-    </description>
-  </property>
-  
-  <property>
-    <name>hbase.hregion.majorcompaction</name>
-    <value>604800000</value>
-    <description>Time between major compactions, expressed in milliseconds. Set to 0 to disable
-      time-based automatic major compactions. User-requested and size-based major compactions will
-      still run. This value is multiplied by hbase.hregion.majorcompaction.jitter to cause
-      compaction to start at a somewhat-random time during a given window of time. The default value
-      is 7 days, expressed in milliseconds. If major compactions are causing disruption in your
-      environment, you can configure them to run at off-peak times for your deployment, or disable
-      time-based major compactions by setting this parameter to 0, and run major compactions in a
-      cron job or by another external mechanism.</description>
-  </property>
-  <property>
-    <name>hbase.hregion.majorcompaction.jitter</name>
-    <value>0.50</value>
-    <description>A multiplier applied to hbase.hregion.majorcompaction to cause compaction to occur
-      a given amount of time either side of hbase.hregion.majorcompaction. The smaller the number,
-      the closer the compactions will happen to the hbase.hregion.majorcompaction
-      interval.</description>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.block.multiplier</name>
-    <value>4</value>
-    <description>
-    Block updates if memstore has hbase.hregion.memstore.block.multiplier
-    times hbase.hregion.memstore.flush.size bytes.  Useful preventing
-    runaway memstore during spikes in update traffic.  Without an
-    upper-bound, memstore fills such that when it flushes the
-    resultant flush files take a long time to compact or split, or
-    worse, we OOME.
-    </description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/metainfo.xml
deleted file mode 100644
index 9b357d0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HBASE/metainfo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>HBASE</name>
-      <displayName>HBase</displayName>
-      <version>0.98.4.2.2.0.0</version>
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>hbase_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>hbase-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-env.xml
deleted file mode 100644
index 0eb4ef2..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-env.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <!-- hive-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for hive-env.sh file</description>
-    <value>
- if [ "$SERVICE" = "cli" ]; then
-   if [ -z "$DEBUG" ]; then
-     export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -Xms10m -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:+UseParNewGC -XX:-UseGCOverheadLimit"
-   else
-     export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -Xms10m -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:-UseGCOverheadLimit"
-   fi
- fi
-
-# The heap size of the jvm stared by hive shell script can be controlled via:
-
-export HADOOP_HEAPSIZE="{{hive_heapsize}}"
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
-
-# Larger heap size may be required when running queries over large number of files or partitions.
-# By default hive shell scripts use a heap size of 256 (MB).  Larger heap size would also be
-# appropriate for hive server (hwi etc).
-
-
-# Set HADOOP_HOME to point to a specific hadoop install directory
-HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
-
-# Hive Configuration Directory can be controlled by:
-export HIVE_CONF_DIR={{hive_config_dir}}
-
-# Folder containing extra libraries required for hive compilation/execution can be controlled by:
-if [ "${HIVE_AUX_JARS_PATH}" != "" ]; then
-  export HIVE_AUX_JARS_PATH=${HIVE_AUX_JARS_PATH}
-elif [ -d "/usr/hdp/current/hive-webhcat/share/hcatalog" ]; then
-  export HIVE_AUX_JARS_PATH=/usr/hdp/current/hive-webhcat/share/hcatalog
-fi
-
-export METASTORE_PORT={{hive_metastore_port}}
-    </value>
-  </property>
-  
-</configuration>


[2/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metrics.json
deleted file mode 100644
index df7e15f..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metrics.json
+++ /dev/null
@@ -1,2548 +0,0 @@
-{
-  "NODEMANAGER": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputsFailed": {
-              "metric": "mapred.ShuffleOutputsFailed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "jvm.JvmMetrics.ThreadsRunnable",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "jvm.JvmMetrics.ThreadsNew",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "rpc.metrics.RpcAuthorizationFailures",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.ugi.LoginSuccessAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "rpc.rpc.RpcQueueTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersCompleted": {
-              "metric": "yarn.ContainersCompleted",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "rpc.rpc.SentBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersKilled": {
-              "metric": "yarn.ContainersKilled",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "jvm.JvmMetrics.LogWarn",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "jvm.JvmMetrics.GcCount",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "rpc.rpc.ReceivedBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "rpc.rpc.RpcQueueTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AllocatedGB": {
-              "metric": "yarn.AllocatedGB",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "rpc.rpc.NumOpenConnections",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputsOK": {
-              "metric": "mapred.ShuffleOutputsOK",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersFailed": {
-              "metric": "yarn.ContainersFailed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.ugi.LoginSuccessNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "jvm.JvmMetrics.GcTimeMillis",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AllocatedContainers": {
-              "metric": "yarn.AllocatedContainers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "jvm.JvmMetrics.ThreadsTerminated",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "rpc.rpc.CallQueueLength",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersRunning": {
-              "metric": "yarn.ContainersRunning",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "jvm.JvmMetrics.LogInfo",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersLaunched": {
-              "metric": "yarn.ContainersLaunched",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "rpc.rpc.RpcProcessingTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.ugi.LoginFailureNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AvailableGB": {
-              "metric": "yarn.AvailableGB",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleConnections": {
-              "metric": "mapred.ShuffleConnections",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersIniting": {
-              "metric": "yarn.ContainersIniting",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logError": {
-              "metric": "jvm.JvmMetrics.LogError",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.ugi.LoginFailureAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthorizationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "jvm.JvmMetrics.LogFatal",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputBytes": {
-              "metric": "mapred.ShuffleOutputBytes",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "rpc.metrics.RpcAuthenticationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "rpc.metrics.RpcAuthenticationFailures",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputsFailed": {
-              "metric": "mapred.ShuffleOutputsFailed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "jvm.JvmMetrics.ThreadsRunnable",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "jvm.JvmMetrics.ThreadsNew",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "rpc.metrics.RpcAuthorizationFailures",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.ugi.LoginSuccessAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "rpc.rpc.RpcQueueTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersCompleted": {
-              "metric": "yarn.ContainersCompleted",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "rpc.rpc.SentBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersKilled": {
-              "metric": "yarn.ContainersKilled",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "jvm.JvmMetrics.LogWarn",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "jvm.JvmMetrics.GcCount",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "rpc.rpc.ReceivedBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "rpc.rpc.RpcQueueTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AllocatedGB": {
-              "metric": "yarn.AllocatedGB",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "rpc.rpc.NumOpenConnections",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputsOK": {
-              "metric": "mapred.ShuffleOutputsOK",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersFailed": {
-              "metric": "yarn.ContainersFailed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.ugi.LoginSuccessNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "jvm.JvmMetrics.GcTimeMillis",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AllocatedContainers": {
-              "metric": "yarn.AllocatedContainers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "jvm.JvmMetrics.ThreadsTerminated",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "rpc.rpc.CallQueueLength",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersRunning": {
-              "metric": "yarn.ContainersRunning",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "jvm.JvmMetrics.LogInfo",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersLaunched": {
-              "metric": "yarn.ContainersLaunched",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "rpc.rpc.RpcProcessingTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.ugi.LoginFailureNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/AvailableGB": {
-              "metric": "yarn.AvailableGB",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleConnections": {
-              "metric": "mapred.ShuffleConnections",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ContainersIniting": {
-              "metric": "yarn.ContainersIniting",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logError": {
-              "metric": "jvm.JvmMetrics.LogError",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.ugi.LoginFailureAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthorizationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "jvm.JvmMetrics.LogFatal",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/mapred/ShuffleOutputBytes": {
-              "metric": "mapred.ShuffleOutputBytes",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "rpc.metrics.RpcAuthenticationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "rpc.metrics.RpcAuthenticationFailures",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      },
-      {
-        "type": "jmx",
-        "metrics": {
-          "default": {
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.MemHeapCommittedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsRunnable",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsNew",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.CallQueueLength",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthorizationFailures",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcQueueTimeAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "Hadoop:service=NodeManager,name=UgiMetrics.LoginSuccessAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.SentBytes",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.LogInfo",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.LogWarn",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "Hadoop:service=NodeManager,name=UgiMetrics.LoginFailureNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcProcessingTimeNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.GcCount",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.ReceivedBytes",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsBlocked",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcQueueTimeNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logError": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.LogError",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "Hadoop:service=NodeManager,name=UgiMetrics.LoginFailureAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthorizationSuccesses",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.NumOpenConnections",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.MemHeapUsedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.LogFatal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcProcessingTimeAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsWaiting",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.GcTimeMillis",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "Hadoop:service=NodeManager,name=UgiMetrics.LoginSuccessNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthenticationSuccesses",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthenticationFailures",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsTerminated",
-              "pointInTime": true,
-              "temporal": false
-            }
-          }
-        }
-      }
-    ]
-  },
-  "RESOURCEMANAGER": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/rpcdetailed/FinishApplicationMasterNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.FinishApplicationMasterNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsCompleted": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsCompleted",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumUnhealthyNMs": {
-              "metric": "yarn.ClusterMetrics.NumUnhealthyNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "jvm.JvmMetrics.ThreadsRunnable",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumRebootedNMs": {
-              "metric": "yarn.ClusterMetrics.NumRebootedNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "jvm.JvmMetrics.ThreadsNew",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsSubmitted": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsSubmitted",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumLostNMs": {
-              "metric": "yarn.ClusterMetrics.NumLostNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.ugi.LoginSuccessAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "rpc.rpc.RpcQueueTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AllocatedContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AllocatedContainers",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "rpc.rpc.SentBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsKilled": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsKilled",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumActiveNMs": {
-              "metric": "yarn.ClusterMetrics.NumActiveNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "jvm.JvmMetrics.LogWarn",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsFailed": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsFailed",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "jvm.JvmMetrics.GcCount",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "rpc.rpc.ReceivedBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/AllocateNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsRunning": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsRunning",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumDecommissionedNMs": {
-              "metric": "yarn.ClusterMetrics.NumDecommissionedNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "rpc.rpc.RpcQueueTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "rpc.rpc.NumOpenConnections",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.ugi.LoginSuccessNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillisCopy": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "jvm.JvmMetrics.GcTimeMillis",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/PendingContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).PendingContainers",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memMaxM": {
-              "metric": "jvm.JvmMetrics.MemMaxM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "jvm.JvmMetrics.ThreadsTerminated",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/AllocateAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetApplicationReportNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetApplicationReportNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/FinishApplicationMasterAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.FinishApplicationMasterAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "rpc.rpc.CallQueueLength",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/RegisterApplicationMasterNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterApplicationMasterNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AvailableMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AvailableMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/PendingMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).PendingMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "jvm.JvmMetrics.LogInfo",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "rpc.rpc.RpcProcessingTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.ugi.LoginFailureNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/SubmitApplicationAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.SubmitApplicationAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetNewApplicationNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetNewApplicationNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsPending": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsPending",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCountCopy": {
-              "metric": "jvm.JvmMetrics.GcCountCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logError": {
-              "metric": "jvm.JvmMetrics.LogError",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.ugi.LoginFailureAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/SubmitApplicationNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.SubmitApplicationNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillisMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthorizationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AllocatedMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AllocatedMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "jvm.JvmMetrics.LogFatal",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetApplicationReportAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetApplicationReportAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/NodeHeartbeatAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetNewApplicationAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetNewApplicationAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/RegisterApplicationMasterAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterApplicationMasterAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/ReservedContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).ReservedContainers",
-              "pointInTime": false,
-              "temporal": true
-            }
-          }
-        }
-      },
-      {
-        "type": "jmx",
-        "metrics": {
-          "default": {
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsFailed": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsFailed",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/rebootedNMcount": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumRebootedNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapCommittedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumUnhealthyNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumUnhealthyNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/HeapMemoryMax": {
-              "metric": "java.lang:type=Memory.HeapMemoryUsage[max]",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/HeapMemoryUsed": {
-              "metric": "java.lang:type=Memory.HeapMemoryUsage[used]",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/NonHeapMemoryMax": {
-              "metric": "java.lang:type=Memory.NonHeapMemoryUsage[max]",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/NonHeapMemoryUsed": {
-              "metric": "java.lang:type=Memory.NonHeapMemoryUsage[used]",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsRunnable",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsNew",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumRebootedNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumRebootedNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/runtime/StartTime": {
-              "metric": "java.lang:type=Runtime.StartTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsKilled": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsKilled",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationFailures",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AggregateContainersAllocated": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AggregateContainersAllocated",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumLostNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumLostNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/StartTime": {
-              "metric": "java.lang:type=Runtime.StartTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/ReservedContainers": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).ReservedContainers",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsSubmitted": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsSubmitted",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.SentBytes",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumActiveNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/running_300": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).running_300",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.LogWarn",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.GcCount",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.ReceivedBytes",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsBlocked",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/running_60": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).running_60",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumDecommissionedNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumDecommissionedNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AllocatedContainers": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AllocatedContainers",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/PendingContainers": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).PendingContainers",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.NumOpenConnections",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapUsedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsWaiting",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.GcTimeMillis",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsTerminated",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memMaxM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemMaxM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/unhealthyNMcount": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumUnhealthyNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/ReservedVCores": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).ReservedVCores",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/decommissionedNMcount": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumDecommissionedNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/startTime": {
-              "metric": "java.lang:type=Runtime.StartTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/ActiveApplications": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).ActiveApplications",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AvailableMB": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AvailableMB",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/nodeManagers": {
-              "metric": "Hadoop:service=ResourceManager,name=RMNMInfo.LiveNodeManagers",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.CallQueueLength",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AllocatedVCores": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AllocatedVCores",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsPending": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsPending",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsCompleted": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsCompleted",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/ActiveUsers": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).ActiveUsers",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.LogInfo",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsRunning": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsRunning",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/running_1440": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).running_1440",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AvailableVCores": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AvailableVCores",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeNumOps",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/ReservedMB": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).ReservedMB",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logError": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.LogError",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/PendingMB": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).PendingMB",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationSuccesses",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.LogFatal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeAvgTime",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/activeNMcount": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationSuccesses",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AggregateContainersReleased": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AggregateContainersReleased",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationFailures",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "ServiceComponentInfo/rm_metrics/cluster/lostNMcount": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumLostNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AllocatedMB": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AllocatedMB",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/PendingVCores": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).PendingVCores",
-              "pointInTime": true,
-              "temporal": false
-            }
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/rpcdetailed/FinishApplicationMasterNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.FinishApplicationMasterNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsCompleted": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsCompleted",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumUnhealthyNMs": {
-              "metric": "yarn.ClusterMetrics.NumUnhealthyNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "jvm.JvmMetrics.ThreadsRunnable",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumRebootedNMs": {
-              "metric": "yarn.ClusterMetrics.NumRebootedNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "jvm.JvmMetrics.ThreadsNew",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsSubmitted": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsSubmitted",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumLostNMs": {
-              "metric": "yarn.ClusterMetrics.NumLostNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.ugi.LoginSuccessAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_avg_time": {
-              "metric": "rpc.rpc.RpcQueueTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AllocatedContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AllocatedContainers",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/SentBytes": {
-              "metric": "rpc.rpc.SentBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsKilled": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsKilled",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumActiveNMs": {
-              "metric": "yarn.ClusterMetrics.NumActiveNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logWarn": {
-              "metric": "jvm.JvmMetrics.LogWarn",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTimedWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsFailed": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsFailed",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCount": {
-              "metric": "jvm.JvmMetrics.GcCount",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/ReceivedBytes": {
-              "metric": "rpc.rpc.ReceivedBytes",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/AllocateNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsRunning": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsRunning",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/NumDecommissionedNMs": {
-              "metric": "yarn.ClusterMetrics.NumDecommissionedNMs",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcQueueTime_num_ops": {
-              "metric": "rpc.rpc.RpcQueueTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/NumOpenConnections": {
-              "metric": "rpc.rpc.NumOpenConnections",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memHeapUsedM": {
-              "metric": "jvm.JvmMetrics.MemHeapUsedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/threadsWaiting": {
-              "metric": "jvm.JvmMetrics.ThreadsWaiting",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.ugi.LoginSuccessNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillisCopy": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillis": {
-              "metric": "jvm.JvmMetrics.GcTimeMillis",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/PendingContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).PendingContainers",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/memMaxM": {
-              "metric": "jvm.JvmMetrics.MemMaxM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/threadsTerminated": {
-              "metric": "jvm.JvmMetrics.ThreadsTerminated",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/AllocateAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/memNonHeapCommittedM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetApplicationReportNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetApplicationReportNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/FinishApplicationMasterAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.FinishApplicationMasterAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/callQueueLen": {
-              "metric": "rpc.rpc.CallQueueLength",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/RegisterApplicationMasterNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterApplicationMasterNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AvailableMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AvailableMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/PendingMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).PendingMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logInfo": {
-              "metric": "jvm.JvmMetrics.LogInfo",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_num_ops": {
-              "metric": "rpc.rpc.RpcProcessingTimeNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.ugi.LoginFailureNumOps",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/SubmitApplicationAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.SubmitApplicationAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetNewApplicationNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetNewApplicationNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AppsPending": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AppsPending",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/gcCountCopy": {
-              "metric": "jvm.JvmMetrics.GcCountCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/logError": {
-              "metric": "jvm.JvmMetrics.LogError",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.ugi.LoginFailureAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/SubmitApplicationNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.SubmitApplicationNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/gcTimeMillisMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpcAuthorizationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthorizationSuccesses",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/AllocatedMB": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).AllocatedMB",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/jvm/logFatal": {
-              "metric": "jvm.JvmMetrics.LogFatal",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpc/RpcProcessingTime_avg_time": {
-              "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetApplicationReportAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetApplicationReportAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/NodeHeartbeatAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/GetNewApplicationAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetNewApplicationAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/RegisterApplicationMasterAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterApplicationMasterAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\"([.])\",\"/\")/ReservedContainers": {
-              "metric": "yarn.QueueMetrics.Queue=(.+).ReservedContainers",
-              "pointInTime": false,
-              "temporal": true
-            }
-          }
-        }
-      },
-      {
-        "type": "jmx",
-        "metrics": {
-          "default": {
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsFailed": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsFailed",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/memHeapCommittedM": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.MemHeapCommittedM",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumUnhealthyNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumUnhealthyNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsRunnable": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsRunnable",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/jvm/threadsNew": {
-              "metric": "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsNew",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/ClusterMetrics/NumRebootedNMs": {
-              "metric": "Hadoop:service=ResourceManager,name=ClusterMetrics.NumRebootedNMs",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)/AppsKilled": {
-              "metric": "Hadoop:service=ResourceManager,name=QueueMetrics(.+).AppsKilled",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationFailures",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/yarn/Queue/$1.re

<TRUNCATED>

[3/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider.py
deleted file mode 100644
index 48c534e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Ambari Agent
-
-"""
-import os
-
-from resource_management import *
-
-
-def slider():
-  import params
-
-  Directory(params.slider_conf_dir,
-            recursive=True
-  )
-
-  slider_client_config = params.config['configurations']['slider-client'] if 'configurations' in params.config and 'slider-client' in params.config['configurations'] else {}
-
-  XmlConfig("slider-client.xml",
-            conf_dir=params.slider_conf_dir,
-            configurations=slider_client_config
-  )
-
-  File(format("{slider_conf_dir}/slider-env.sh"),
-       mode=0755,
-       content=InlineTemplate(params.slider_env_sh_template)
-  )
-
-  Directory(params.storm_slider_conf_dir,
-            recursive=True
-  )
-
-  File(format("{storm_slider_conf_dir}/storm-slider-env.sh"),
-       mode=0755,
-       content=Template('storm-slider-env.sh.j2')
-  )
-
-  if (params.log4j_props != None):
-    File(format("{params.slider_conf_dir}/log4j.properties"),
-         mode=0644,
-         content=params.log4j_props
-    )
-  elif (os.path.exists(format("{params.slider_conf_dir}/log4j.properties"))):
-    File(format("{params.slider_conf_dir}/log4j.properties"),
-         mode=0644
-    )

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider_client.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider_client.py
deleted file mode 100644
index cb22a99..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/slider_client.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-from slider import slider
-
-
-class SliderClient(Script):
-  def install(self, env):
-    self.install_packages(env)
-    self.configure(env)
-
-  def configure(self, env):
-    import params
-
-    env.set_params(params)
-
-    slider()
-
-  def status(self, env):
-    raise ClientComponentHasNoStatus()
-
-
-if __name__ == "__main__":
-  SliderClient().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/templates/storm-slider-env.sh.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/templates/storm-slider-env.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/templates/storm-slider-env.sh.j2
deleted file mode 100644
index 8022a4b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/templates/storm-slider-env.sh.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements.  See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership.  The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License.  You may obtain a copy of the License at
-# *
-# *     http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-export JAVA_HOME={{java64_home}}
-export SLIDER_HOME={{slider_home_dir}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SQOOP/metainfo.xml
deleted file mode 100644
index efb05cd..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SQOOP/metainfo.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>SQOOP</name>
-      <version>1.4.5.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>mysql-connector-java</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>sqoop_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>sqoop-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/configuration/tez-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/configuration/tez-site.xml
deleted file mode 100644
index 50345fd..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/configuration/tez-site.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<configuration supports_final="true" supports_do_not_extend="true">
-
-  <property>
-    <name>tez.lib.uris</name>
-    <value>/hdp/apps/${hdp.version}/tez/tez.tar.gz</value>
-    <description>Comma-delimited list of the location of the Tez libraries which will be localized for DAGs.
-      Specifying a single .tar.gz or .tgz assumes that a compressed version of the tez libs is being used. This is uncompressed into a tezlibs directory when running containers, and tezlibs/;tezlibs/lib/ are added to the classpath (after . and .*).
-      If multiple files are specified - files are localized as regular files, contents of directories are localized as regular files (non-recursive).
-    </description>
-  </property>
-
-  <property>
-    <name>tez.cluster.additional.classpath.prefix</name>
-    <value>/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>tez.am.log.level</name>
-    <value>INFO</value>
-    <description>Root Logging level passed to the Tez app master</description>
-  </property>
-
-  <property>
-    <name>tez.generate.debug.artifacts</name>
-    <value>false</value>
-    <description>Generate debug artifacts such as a text representation of the submitted DAG plan</description>
-  </property>
-
-  <property>
-    <name>tez.staging-dir</name>
-    <value>/tmp/${user.name}/staging</value>
-    <description>The staging dir used while submitting DAGs</description>
-  </property>
-
-  <property>
-    <name>tez.am.resource.memory.mb</name>
-    <value>1536</value>
-    <description>The amount of memory to be used by the AppMaster.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.launch.cmd-opts</name>
-    <value>-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC</value>
-    <description>Java options for the Tez AppMaster process. The Xmx value is derived based on tez.am.resource.memory.mb and is 80% of the value by default.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.launch.cluster-default.cmd-opts</name>
-    <value>-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
-    <description>Cluster default Java options for the Tez AppMaster process. These will be prepended to the properties specified via tez.am.launch.cmd-opts</description>
-  </property>
-
-  <property>
-    <name>tez.am.launch.env</name>
-    <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value>
-    <description>
-        Additional execution environment entries for tez. This is not an additive property. You must preserve the original value if
-        you want to have access to native libraries.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.task.resource.memory.mb</name>
-    <value>1536</value>
-    <description>The amount of memory to be used by launched tasks.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.task.launch.cmd-opts</name>
-    <value>-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC</value>
-    <description>Java options for tasks. The Xmx value is derived based on tez.task.resource.memory.mb and is 80% of this value by default.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.task.launch.cluster-default.cmd-opts</name>
-    <value>-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
-    <description>Cluster default Java options for tasks. These will be prepended to the properties specified via tez.task.launch.cmd-opts</description>
-  </property>
-
-  <property>
-    <name>tez.task.launch.env</name>
-    <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value>
-    <description>
-      Additional execution environment entries for tez. This is not an additive property. You must preserve the original value if
-      you want to have access to native libraries.
-      Used only if the value is not specified explicitly by the DAG definition.
-    </description>
-  </property>
-
-  <property>
-    <name>tez.shuffle-vertex-manager.min-src-fraction</name>
-    <value>0.2</value>
-    <description>In case of a ScatterGather connection, the fraction of source tasks which should
-      complete before tasks for the current vertex are schedule
-    </description>
-  </property>
-
-  <property>
-    <name>tez.shuffle-vertex-manager.max-src-fraction</name>
-    <value>0.4</value>
-    <description>In case of a ScatterGather connection, once this fraction of source tasks have
-      completed, all tasks on the current vertex can be scheduled. Number of tasks ready for
-      scheduling on the current vertex scales linearly between min-fraction and max-fraction
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.am-rm.heartbeat.interval-ms.max</name>
-    <value>250</value>
-    <description>The maximum heartbeat interval between the AM and RM in milliseconds</description>
-  </property>
-
-  <property>
-    <name>tez.grouping.split-waves</name>
-    <value>1.7</value>
-    <description>The multiplier for available queue capacity when determining number of tasks for
-      a Vertex. 1.7 with 100% queue available implies generating a number of tasks roughly equal
-      to 170% of the available containers on the queue
-    </description>
-  </property>
-
-  <property>
-    <name>tez.grouping.min-size</name>
-    <value>16777216</value>
-    <description>Lower bound on the size (in bytes) of a grouped split, to avoid generating
-      too many splits
-    </description>
-  </property>
-
-  <property>
-    <name>tez.grouping.max-size</name>
-    <value>1073741824</value>
-    <description>Upper bound on the size (in bytes) of a grouped split, to avoid generating
-      excessively large split
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.container.reuse.enabled</name>
-    <value>true</value>
-    <description>Configuration to specify whether container should be reused</description>
-  </property>
-
-  <property>
-    <name>tez.am.container.reuse.rack-fallback.enabled</name>
-    <value>true</value>
-    <description>Whether to reuse containers for rack local tasks. Active only if reuse is enabled
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.container.reuse.non-local-fallback.enabled</name>
-    <value>false</value>
-    <description>Whether to reuse containers for non-local tasks. Active only if reuse is enabled
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.container.idle.release-timeout-min.millis</name>
-    <value>10000</value>
-    <description>The minimum amount of time to hold on to a container that is idle. Only active when reuse is enabled.</description>
-  </property>
-
-  <property>
-    <name>tez.am.container.idle.release-timeout-max.millis</name>
-    <value>20000</value>
-    <description>The maximum amount of time to hold on to a container if no task can be assigned to it immediately. Only active when reuse is enabled.</description>
-  </property>
-
-  <property>
-    <name>tez.am.container.reuse.locality.delay-allocation-millis</name>
-    <value>250</value>
-    <description>The amount of time to wait before assigning a container to the next level of
-      locality. NODE -> RACK -> NON_LOCAL
-    </description>
-  </property>
-
-  <property>
-    <name>tez.am.max.app.attempts</name>
-    <value>2</value>
-    <description>Specifies the total number of time the app master will run in case recovery is triggered</description>
-  </property>
-
-  <property>
-    <name>tez.am.maxtaskfailures.per.node</name>
-    <value>10</value>
-    <description>The maximum number of allowed task attempt failures on a node before
-      it gets marked as blacklisted
-    </description>
-  </property>
-
-  <property>
-    <name>tez.task.am.heartbeat.counter.interval-ms.max</name>
-    <value>4000</value>
-    <description>Time interval at which task counters are sent to the AM</description>
-  </property>
-
-  <property>
-    <name>tez.task.get-task.sleep.interval-ms.max</name>
-    <value>200</value>
-    <description>The maximum amount of time, in seconds, to wait before a task asks an AM for
-      another task
-    </description>
-  </property>
-
-  <property>
-    <name>tez.task.max-events-per-heartbeat</name>
-    <value>500</value>
-    <description>Maximum number of of events to fetch from the AM by the tasks in a single heartbeat.</description>
-  </property>
-
-  <property>
-    <name>tez.session.client.timeout.secs</name>
-    <value>-1</value>
-    <description>Time (in seconds) to wait for AM to come up when trying to submit a DAG from
-      the client
-    </description>
-  </property>
-
-  <property>
-    <name>tez.session.am.dag.submit.timeout.secs</name>
-    <value>300</value>
-    <description>Time (in seconds) for which the Tez AM should wait for a DAG to be submitted
-      before shutting down
-    </description>
-  </property>
-
-  <property>
-    <name>tez.counters.max</name>
-    <value>2000</value>
-    <description>The number of allowed counters for the executing DAG</description>
-  </property>
-
-  <property>
-    <name>tez.counters.max.groups</name>
-    <value>1000</value>
-    <description>The number of allowed counter groups for the executing DAG</description>
-  </property>
-
-
-  <!-- Configuration for runtime components -->
-
-  <!-- These properties can be set on a per edge basis by configuring the payload for each
-       edge independently. -->
-
-
-  <property>
-    <name>tez.runtime.compress</name>
-    <value>true</value>
-    <description>Whether intermediate data should be compressed or not</description>
-  </property>
-
-  <property>
-    <name>tez.runtime.compress.codec</name>
-    <value>org.apache.hadoop.io.compress.SnappyCodec</value>
-    <description>The coded to be used if compressing intermediate data. Only
-      applicable if tez.runtime.compress is enabled
-    </description>
-  </property>
-
-  <property>
-    <name>tez.runtime.io.sort.mb</name>
-    <value>512</value>
-    <description>The size of the sort buffer when output needs to be sorted</description>
-  </property>
-
-  <property>
-    <name>tez.runtime.unordered.output.buffer.size-mb</name>
-    <value>100</value>
-    <description>The size of the buffer when output does not require to be sorted</description>
-  </property>
-
-  <property>
-    <name>tez.history.logging.service.class</name>
-    <value>org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService</value>
-    <description>The class to be used for logging history data.
-      Set to org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService to log to ATS
-      Set to org.apache.tez.dag.history.logging.impl.SimpleHistoryLoggingService to log to the filesystem specified by ${fs.defaultFS}
-    </description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/metainfo.xml
deleted file mode 100644
index 5e51f6f..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/TEZ/metainfo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>TEZ</name>
-      <displayName>Tez</displayName>
-      <version>0.5.2.2.2.0.0</version>
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>tez_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>tez-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-env.xml
deleted file mode 100644
index b5280ce..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-env.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-
-  
-  <!-- mapred-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for mapred-env.sh file</description>
-    <value>
-# export JAVA_HOME=/home/y/libexec/jdk1.6.0/
-
-export HADOOP_JOB_HISTORYSERVER_HEAPSIZE={{jobhistory_heapsize}}
-
-export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
-
-#export HADOOP_JOB_HISTORYSERVER_OPTS=
-#export HADOOP_MAPRED_LOG_DIR="" # Where log files are stored.  $HADOOP_MAPRED_HOME/logs by default.
-#export HADOOP_JHS_LOGGER=INFO,RFA # Hadoop JobSummary logger.
-#export HADOOP_MAPRED_PID_DIR= # The pid files are stored. /tmp by default.
-#export HADOOP_MAPRED_IDENT_STRING= #A string representing this instance of hadoop. $USER by default
-#export HADOOP_MAPRED_NICENESS= #The scheduling priority for daemons. Defaults to 0.
-export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml
deleted file mode 100644
index 5856e02..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <property>
-    <name>mapreduce.admin.user.env</name>
-    <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value>
-    <description>
-      Additional execution environment entries for map and reduce task processes.
-      This is not an additive property. You must preserve the original value if
-      you want your map and reduce tasks to have access to native libraries (compression, etc)
-    </description>
-  </property>
-
-  <property>
-    <name>mapreduce.application.classpath</name>
-    <value>/usr/hdp/${hdp.version}/hadoop/lib:/etc/hadoop/conf:/usr/lib/hadoop/*:/usr/lib/hadoop/lib/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure</value>
-    <description>
-      CLASSPATH for MR applications. A comma-separated list of CLASSPATH
-      entries.
-    </description>
-  </property>
-
-  <property>
-    <name>mapreduce.application.framework.path</name>
-    <value>/hdp/apps/${hdp.version}/mapreduce/mapreduce.tar.gz#mr-framework</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>yarn.app.mapreduce.am.admin-command-opts</name>
-    <value>-Dhdp.version=${hdp.version}</value>
-    <description>
-      Java opts for the MR App Master processes.
-      The following symbol, if present, will be interpolated: @taskid@ is replaced
-      by current TaskID. Any other occurrences of '@' will go unchanged.
-      For example, to enable verbose gc logging to a file named for the taskid in
-      /tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:
-      -Xmx1024m -verbose:gc -Xloggc:/tmp/@taskid@.gc
-
-      Usage of -Djava.library.path can cause programs to no longer function if
-      hadoop native libraries are used. These values should instead be set as part
-      of LD_LIBRARY_PATH in the map / reduce JVM env using the mapreduce.map.env and
-      mapreduce.reduce.env config settings.
-    </description>
-  </property>
-
-  <property>
-    <name>mapreduce.admin.map.child.java.opts</name>
-    <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.admin.reduce.child.java.opts</name>
-    <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.reduce.shuffle.fetch.retry.enabled</name>
-    <value>1</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.reduce.shuffle.fetch.retry.interval-ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.reduce.shuffle.fetch.retry.timeout-ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.job.emit-timeline-data</name>
-    <value>false</value>
-    <description></description>
-  </property>
-
-  <property>
-    <name>mapreduce.jobhistory.bind-host</name>
-    <value>0.0.0.0</value>
-    <description></description>
-  </property>
-
-
-  <!--glusterfs properties -->
-  <property>
-    <name>mapreduce.jobhistory.intermediate-done-dir</name>
-    <value>glusterfs:///mr-history/tmp</value>
-    <description>
-      Directory where history files are written by MapReduce jobs.
-    </description>
-  </property>
-
-  <property>
-    <name>mapreduce.jobhistory.done-dir</name>
-    <value>glusterfs:///mr-history/done</value>
-    <description>
-      Directory where history files are managed by the MR JobHistory Server.
-    </description>
-  </property>
-  <property>
-     <name>yarn.app.mapreduce.am.staging-dir</name>
-     <value>glusterfs:///user</value>
-     <description>
-       The staging dir used while submitting jobs.
-     </description>
-  </property>
-  <property>
-     <name>mapred.healthChecker.script.path</name>
-     <value>glusterfs:///mapred/jobstatus</value>
-   </property>
-  <property>
-     <name>mapred.job.tracker.history.completed.location</name>
-     <value>glusterfs:///mapred/history/done</value>
-  </property>
-
-  <property>
-    <name>mapred.system.dir</name>
-    <value>glusterfs:///mapred/system</value>
-  </property>
-
-  <property>
-    <name>mapreduce.jobtracker.staging.root.dir</name>
-    <value>glusterfs:///user</value>
-  </property>
-
-  <property>
-    <name>mapred.healthChecker.script.path</name>
-    <value>glusterfs:///mapred/jobstatus</value>
-  </property>
-
-  <property>
-    <name>mapred.job.tracker.history.completed.location</name>
-    <value>glusterfs:///mapred/history/done</value>
-  </property>
-
-  <property>
-    <name>mapred.system.dir</name>
-    <value>glusterfs:///mapred/system</value>
-  </property>
-
-  <property>
-    <name>mapreduce.jobtracker.staging.root.dir</name>
-    <value>glusterfs:///user</value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
deleted file mode 100644
index 4513fdd..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<configuration>
-    <property>
-        <name>ssl.client.truststore.location</name>
-        <value>/etc/security/clientKeys/all.jks</value>
-        <description>Location of the trust store file.</description>
-    </property>
-    <property>
-        <name>ssl.client.truststore.type</name>
-        <value>jks</value>
-        <description>Optional. Default value is "jks".</description>
-    </property>
-    <property>
-        <name>ssl.client.truststore.password</name>
-        <value>bigdata</value>
-        <property-type>PASSWORD</property-type>
-        <description>Password to open the trust store file.</description>
-    </property>
-    <property>
-        <name>ssl.client.truststore.reload.interval</name>
-        <value>10000</value>
-        <description>Truststore reload interval, in milliseconds.</description>
-    </property>
-    <property>
-        <name>ssl.client.keystore.type</name>
-        <value>jks</value>
-        <description>Optional. Default value is "jks".</description>
-    </property>
-    <property>
-        <name>ssl.client.keystore.location</name>
-        <value>/etc/security/clientKeys/keystore.jks</value>
-        <description>Location of the keystore file.</description>
-    </property>
-    <property>
-        <name>ssl.client.keystore.password</name>
-        <value>bigdata</value>
-        <property-type>PASSWORD</property-type>
-        <description>Password to open the keystore file.</description>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
deleted file mode 100644
index 97cebd6..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<configuration>
-    <property>
-        <name>ssl.server.truststore.location</name>
-        <value>/etc/security/serverKeys/all.jks</value>
-        <description>Location of the trust store file.</description>
-    </property>
-    <property>
-        <name>ssl.server.truststore.type</name>
-        <value>jks</value>
-        <description>Optional. Default value is "jks".</description>
-    </property>
-    <property>
-        <name>ssl.server.truststore.password</name>
-        <value>bigdata</value>
-        <property-type>PASSWORD</property-type>
-        <description>Password to open the trust store file.</description>
-    </property>
-    <property>
-        <name>ssl.server.truststore.reload.interval</name>
-        <value>10000</value>
-        <description>Truststore reload interval, in milliseconds.</description>
-    </property>
-    <property>
-        <name>ssl.server.keystore.type</name>
-        <value>jks</value>
-        <description>Optional. Default value is "jks".</description>
-    </property>
-    <property>
-        <name>ssl.server.keystore.location</name>
-        <value>/etc/security/serverKeys/keystore.jks</value>
-        <description>Location of the keystore file.</description>
-    </property>
-    <property>
-        <name>ssl.server.keystore.password</name>
-        <value>bigdata</value>
-        <property-type>PASSWORD</property-type>
-        <description>Password to open the keystore file.</description>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
deleted file mode 100644
index cf8242b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/capacity-scheduler.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>yarn.scheduler.capacity.maximum-applications</name>
-    <value>10000</value>
-    <description>
-      Maximum number of applications that can be pending and running.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.maximum-am-resource-percent</name>
-    <value>0.2</value>
-    <description>
-      Maximum percent of resources in the cluster which can be used to run 
-      application masters i.e. controls number of concurrent running
-      applications.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.queues</name>
-    <value>default</value>
-    <description>
-      The queues at the this level (root is the root queue).
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.capacity</name>
-    <value>100</value>
-    <description>
-      The total capacity as a percentage out of 100 for this queue.
-      If it has child queues then this includes their capacity as well.
-      The child queues capacity should add up to their parent queue's capacity
-      or less.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.capacity</name>
-    <value>100</value>
-    <description>Default queue target capacity.</description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.user-limit-factor</name>
-    <value>1</value>
-    <description>
-      Default queue user limit a percentage from 0.0 to 1.0.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.maximum-capacity</name>
-    <value>100</value>
-    <description>
-      The maximum capacity of the default queue. 
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.state</name>
-    <value>RUNNING</value>
-    <description>
-      The state of the default queue. State can be one of RUNNING or STOPPED.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
-    <value>*</value>
-    <description>
-      The ACL of who can submit jobs to the default queue.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name>
-    <value>*</value>
-    <description>
-      The ACL of who can administer jobs on the default queue.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
-    <value>*</value>
-    <description>
-      The ACL for who can administer this queue i.e. change sub-queue 
-      allocations.
-    </description>
-  </property>
-  
-  <property>
-    <name>yarn.scheduler.capacity.node-locality-delay</name>
-    <value>40</value>
-    <description>
-      Number of missed scheduling opportunities after which the CapacityScheduler
-      attempts to schedule rack-local containers.
-      Typically this should be set to number of nodes in the cluster, By default is setting
-      approximately number of nodes in one rack which is 40.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.capacity.default.minimum-user-limit-percent</name>
-    <value>100</value>
-    <description>
-      Default minimum queue resource limit depends on the number of users who have submitted applications.
-    </description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/mapred-site.xml.2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/mapred-site.xml.2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/mapred-site.xml.2
deleted file mode 100644
index 6abb71d..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/mapred-site.xml.2
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration xmlns:xi="http://www.w3.org/2001/XInclude">
-
-
-<!-- GLUSTERFS properties -->
-  <property>
-    <name>mapreduce.jobhistory.intermediate-done-dir</name>
-    <value>glusterfs:///mr-history/tmp</value>
-    <description>
-      Directory where history files are written by MapReduce jobs.
-    </description>
-  </property>
-
-  <property>
-    <name>mapreduce.jobhistory.done-dir</name>
-    <value>glusterfs:///mr-history/done</value>
-    <description>
-      Directory where history files are managed by the MR JobHistory Server.
-    </description>
-  </property>
-  <property>
-     <name>yarn.app.mapreduce.am.staging-dir</name>
-     <value>glusterfs:///user</value>
-     <description>
-       The staging dir used while submitting jobs.
-     </description>
-  </property>
-  <property>
-     <name>mapred.healthChecker.script.path</name>
-     <value>glusterfs:///mapred/jobstatus</value>
-   </property>
-  <property>
-     <name>mapred.job.tracker.history.completed.location</name>
-     <value>glusterfs:///mapred/history/done</value>
-  </property>
-
-  <property>
-    <name>mapred.system.dir</name>
-    <value>glusterfs:///mapred/system</value>
-  </property>
-
-  <property>
-    <name>mapreduce.jobtracker.staging.root.dir</name>
-    <value>glusterfs:///user</value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/yarn-site.xml
deleted file mode 100644
index 7731a00..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/configuration/yarn-site.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <!-- ResourceManager -->
-
-  <property>
-    <name>yarn.resourcemanager.hostname</name>
-    <value>localhost</value>
-    <description>The hostname of the RM.</description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.resource-tracker.address</name>
-    <value>localhost:8025</value>
-    <description> The address of ResourceManager. </description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.scheduler.address</name>
-    <value>localhost:8030</value>
-    <description>The address of the scheduler interface.</description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.address</name>
-    <value>localhost:8050</value>
-    <description>
-      The address of the applications manager interface in the
-      RM.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.admin.address</name>
-    <value>localhost:8141</value>
-    <description>The address of the RM admin interface.</description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.scheduler.class</name>
-    <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
-    <description>The class to use as the resource scheduler.</description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.minimum-allocation-mb</name>
-    <value>512</value>
-    <description>
-      The minimum allocation for every container request at the RM,
-      in MBs. Memory requests lower than this won't take effect,
-      and the specified value will get allocated at minimum.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.scheduler.maximum-allocation-mb</name>
-    <value>2048</value>
-    <description>
-      The maximum allocation for every container request at the RM,
-      in MBs. Memory requests higher than this won't take effect,
-      and will get capped to this value.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.acl.enable</name>
-    <value>false</value>
-    <description> Are acls enabled. </description>
-  </property>
-
-  <property>
-    <name>yarn.admin.acl</name>
-    <value></value>
-    <description> ACL of who can be admin of the YARN cluster. </description>
-  </property>
-
-  <!-- NodeManager -->
-
-  <property>
-    <name>yarn.nodemanager.address</name>
-    <value>0.0.0.0:45454</value>
-    <description>The address of the container manager in the NM.</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.resource.memory-mb</name>
-    <value>5120</value>
-    <description>Amount of physical memory, in MB, that can be allocated
-      for containers.</description>
-  </property>
-
-  <property>
-    <name>yarn.application.classpath</name>
-    <value>$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*,/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value>
-    <description>Classpath for typical applications.</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.vmem-pmem-ratio</name>
-    <value>2.1</value>
-    <description>Ratio between virtual memory to physical memory when
-      setting memory limits for containers. Container allocations are
-      expressed in terms of physical memory, and virtual memory usage
-      is allowed to exceed this allocation by this ratio.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.container-executor.class</name>
-    <value>org.apache.hadoop.yarn.server.nodemanager.GlusterContainerExecutor</value>
-    <description>ContainerExecutor for launching containers</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.linux-container-executor.group</name>
-    <value>hadoop</value>
-    <description>Unix group of the NodeManager</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.aux-services</name>
-    <value>mapreduce_shuffle</value>
-    <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
-      not start with numbers</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
-    <value>org.apache.hadoop.mapred.ShuffleHandler</value>
-    <description>The auxiliary service class to use </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.log-dirs</name>
-    <value>/hadoop/yarn/log</value>
-    <description>
-      Where to store container logs. An application's localized log directory
-      will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.
-      Individual containers' log directories will be below this, in directories
-      named container_{$contid}. Each container directory will contain the files
-      stderr, stdin, and syslog generated by that container.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.local-dirs</name>
-    <value>/hadoop/yarn/local</value>
-    <description>
-      List of directories to store localized files in. An
-      application's localized file directory will be found in:
-      ${yarn.nodemanager.local-dirs}/usercache/${user}/appcache/application_${appid}.
-      Individual containers' work directories, called container_${contid}, will
-      be subdirectories of this.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.container-monitor.interval-ms</name>
-    <value>3000</value>
-    <description>
-      The interval, in milliseconds, for which the node manager
-      waits  between two cycles of monitoring its containers' memory usage.
-    </description>
-  </property>
-
-  <!--
-  <property>
-    <name>yarn.nodemanager.health-checker.script.path</name>
-    <value>/etc/hadoop/conf/health_check_nodemanager</value>
-    <description>The health check script to run.</description>
-  </property>
-   -->
-
-  <property>
-    <name>yarn.nodemanager.health-checker.interval-ms</name>
-    <value>135000</value>
-    <description>Frequency of running node health script.</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.health-checker.script.timeout-ms</name>
-    <value>60000</value>
-    <description>Script time out period.</description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.log.retain-second</name>
-    <value>604800</value>
-    <description>
-      Time in seconds to retain user logs. Only applicable if
-      log aggregation is disabled.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.log-aggregation-enable</name>
-    <value>true</value>
-    <description>Whether to enable log aggregation. </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.remote-app-log-dir</name>
-    <value>/app-logs</value>
-    <description>Location to aggregate logs to. </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.remote-app-log-dir-suffix</name>
-    <value>logs</value>
-    <description>
-      The remote log dir will be created at
-      {yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.log-aggregation.compression-type</name>
-    <value>gz</value>
-    <description>
-      T-file compression types used to compress aggregated logs.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.delete.debug-delay-sec</name>
-    <value>0</value>
-    <description>
-      Number of seconds after an application finishes before the nodemanager's
-      DeletionService will delete the application's localized file directory
-      and log directory.
-
-      To diagnose Yarn application problems, set this property's value large
-      enough (for example, to 600 = 10 minutes) to permit examination of these
-      directories. After changing the property's value, you must restart the
-      nodemanager in order for it to have an effect.
-
-      The roots of Yarn applications' work directories is configurable with
-      the yarn.nodemanager.local-dirs property (see below), and the roots
-      of the Yarn applications' log directories is configurable with the
-      yarn.nodemanager.log-dirs property (see also below).
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.log-aggregation.retain-seconds</name>
-    <value>2592000</value>
-    <description>
-      How long to keep aggregation logs before deleting them. -1 disables.
-      Be careful set this too small and you will spam the name node.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.admin-env</name>
-    <value>MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX</value>
-    <description>
-      Environment variables that should be forwarded from the NodeManager's
-      environment to the container's.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name>
-    <value>0.25</value>
-    <description>
-      The minimum fraction of number of disks to be healthy for the nodemanager
-      to launch new containers. This correspond to both
-      yarn-nodemanager.local-dirs and yarn.nodemanager.log-dirs. i.e.
-      If there are less number of healthy local-dirs (or log-dirs) available,
-      then new containers will not be launched on this node.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.am.max-attempts</name>
-    <value>2</value>
-    <description>
-      The maximum number of application attempts. It's a global
-      setting for all application masters. Each application master can specify
-      its individual maximum number of application attempts via the API, but the
-      individual number cannot be more than the global upper bound. If it is,
-      the resourcemanager will override it. The default number is set to 2, to
-      allow at least one retry for AM.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.webapp.address</name>
-    <value>localhost:8088</value>
-    <description>
-      The address of the RM web application.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.nodemanager.vmem-check-enabled</name>
-    <value>false</value>
-    <description>
-      Whether virtual memory limits will be enforced for containers.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.log.server.url</name>
-    <value>http://localhost:19888/jobhistory/logs</value>
-    <description>
-      URI for the HistoryServer's log resource
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.resourcemanager.nodes.exclude-path</name>
-    <value>/etc/hadoop/conf/yarn.exclude</value>
-    <description>
-      Names a file that contains a list of hosts that are
-      not permitted to connect to the resource manager.  The full pathname of the
-      file must be specified.  If the value is empty, no hosts are
-      excluded.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.enabled</name>
-    <value>true</value>
-    <description>Indicate to clients whether timeline service is enabled or not.
-      If enabled, clients will put entities and events to the timeline server.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.store-class</name>
-    <value>org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore</value>
-    <description>
-      Store class name for timeline store
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.generic-application-history.store-class</name>
-    <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
-    <description>
-      Store class name for history store, defaulting to file system store
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.leveldb-timeline-store.path</name>
-    <value>/mnt/glusterfs/hadoop/yarn/timeline</value>
-    <description>
-      Store file name for leveldb timeline store
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.webapp.address</name>
-    <value>0.0.0.0:8188</value>
-    <description>
-      The http address of the timeline service web application.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.webapp.https.address</name>
-    <value>0.0.0.0:8190</value>
-    <description>
-      The http address of the timeline service web application.
-    </description>
-  </property>
-
-  <property>
-    <name>yarn.timeline-service.address</name>
-    <value>0.0.0.0:10200</value>
-    <description>
-      This is default address for the timeline server to start
-      the RPC server.
-    </description>
-  </property>
-  <property>
-    <description>Enable age off of timeline store data.</description>
-    <name>yarn.timeline-service.ttl-enable</name>
-    <value>true</value>
-  </property>
-  <property>
-    <description>Time to live for timeline store data in milliseconds.</description>
-    <name>yarn.timeline-service.ttl-ms</name>
-    <value>2678400000</value>
-  </property>
-  <property>
-    <description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
-    <name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name>
-    <value>300000</value>
-  </property>
-  
-  <!-- New Stuff -->
-  <property>
-    <name>yarn.nodemanager.recovery.enabled</name>
-    <value>false</value>
-    <description>Enable the node manager to recover after starting</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.recovery.dir</name>
-    <value>/var/log/hadoop-yarn/nodemanager/recovery-state</value>
-    <description>
-      The local filesystem directory in which the node manager will store
-      state when recovery is enabled.
-    </description>
-  </property>
-    <property>
-    <name>yarn.client.nodemanager-connect.retry-interval-ms</name>
-    <value>10000</value>
-    <description>Time interval between each attempt to connect to NM</description>
-  </property>
-  <property>
-    <name>yarn.client.nodemanager-connect.max-wait-ms</name>
-    <value>60000</value>
-    <description>Max time to wait to establish a connection to NM</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.recovery.enabled</name>
-    <value>false</value>
-    <description>
-      Enable RM to recover state after starting.
-      If true, then yarn.resourcemanager.store.class must be specified.
-    </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.work-preserving-recovery.enabled</name>
-    <value>false</value>
-    <description>
-      Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature.
-    </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.store.class</name>
-    <value>org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore</value>
-    <description>
-      The class to use as the persistent store.
-      If org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore is used,
-      the store is implicitly fenced; meaning a single ResourceManager
-      is able to use the store at any point in time.
-    </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-address</name>
-    <value>localhost:2181</value>
-    <description>
-      List Host:Port of the ZooKeeper servers to be used by the RM. comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002" If the optional chroot suffix is used the example would look like: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002/app/a" where the client would be rooted at "/app/a" and all paths would be relative to this root - ie getting/setting/etc...  "/foo/bar" would result in operations being run on "/app/a/foo/bar" (from the server perspective).
-    </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-state-store.parent-path</name>
-    <value>/rmstore</value>
-    <description>Full path of the ZooKeeper znode where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore as the value for yarn.resourcemanager.store.class</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-acl</name>
-    <value>world:anyone:rwcda </value>
-    <description>ACL's to be used for ZooKeeper znodes.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms</name>
-    <value>10000</value>
-    <description>Set the amount of time RM waits before allocating new containers on work-preserving-recovery. Such wait period gives RM a chance to settle down resyncing with NMs in the cluster on recovery, before assigning new containers to applications.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.connect.retry-interval.ms</name>
-    <value>30000</value>
-    <description>How often to try connecting to the ResourceManager.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.connect.max-wait.ms</name>
-    <value>900000</value>
-    <description>Maximum time to wait to establish connection to ResourceManager</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-retry-interval-ms</name>
-    <value>1000</value>
-    <description>"Retry interval in milliseconds when connecting to ZooKeeper.
-      When HA is enabled, the value here is NOT used. It is generated
-      automatically from yarn.resourcemanager.zk-timeout-ms and
-      yarn.resourcemanager.zk-num-retries."
-    </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-num-retries</name>
-    <value>1000</value>
-    <description>Number of times RM tries to connect to ZooKeeper.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.zk-timeout-ms</name>
-    <value>10000</value>
-    <description>ZooKeeper session timeout in milliseconds. Session expiration is managed by the ZooKeeper cluster itself, not by the client. This value is used by the cluster to determine when the client's session expires. Expirations happens when the cluster does not hear from the client within the specified session timeout period (i.e. no heartbeat).</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.state-store.max-completed-applications</name>
-    <value>${yarn.resourcemanager.max-completed-applications}</value>
-    <description>The maximum number of completed applications RM state store keeps, less than or equals to ${yarn.resourcemanager.max-completed-applications}. By default, it equals to ${yarn.resourcemanager.max-completed-applications}. This ensures that the applications kept in the state store are consistent with the applications remembered in RM memory. Any values larger than ${yarn.resourcemanager.max-completed-applications} will be reset to ${yarn.resourcemanager.max-completed-applications}. Note that this value impacts the RM recovery performance.Typically,  a smaller value indicates better performance on RM recovery.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.fs.state-store.retry-policy-spec</name>
-    <value>2000, 500</value>
-    <description>hdfs client retry policy specification. hdfs client retry is always enabled. Specified in pairs of sleep-time and number-of-retries and (t0, n0), (t1, n1), ..., the first n0 retries sleep t0 milliseconds on average, the following n1 retries sleep t1 milliseconds on average, and so on.</description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.fs.state-store.uri</name>
-    <value> </value>
-    <description>RI pointing to the location of the FileSystem path where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore as the value for yarn.resourcemanager.store.class </description>
-  </property>
-  <property>
-    <name>yarn.resourcemanager.ha.enabled</name>
-    <value>false</value>
-    <description>enable RM HA or not</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.linux-container-executor.resources-handler.class</name>
-    <value>org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler</value>
-    <description>Pre-requisite to use CGroups</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name>
-    <value>hadoop-yarn</value>
-    <description>Name of the Cgroups hierarchy under which all YARN jobs will be launched</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.linux-container-executor.cgroups.mount</name>
-    <value>false</value>
-    <description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name>
-    <value>false</value>
-    <description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.resource.cpu-vcores</name>
-    <value>8</value>
-    <description></description>
-  </property>
-  <property>
-    <name>yarn.nodemanager.resource.percentage-physical-cpu-limit</name>
-    <value>100</value>
-    <description>The amount of CPU allocated for YARN containers - only effective when used with CGroups</description>
-  </property>
-    
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metainfo.xml
deleted file mode 100644
index 87cb7f2..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/YARN/metainfo.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>YARN</name>
-      <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
-      <version>2.6.0.2.2.0.0</version>
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>hadoop_2_2_*-yarn</name>
-            </package>
-            <package>
-              <name>hadoop_2_2_*-mapreduce</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>hadoop-2-2-.*-yarn</name>
-            </package>
-            <package>
-              <name>hadoop-2-2-.*-mapreduce</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>      
-
-      <requiredServices>
-        <service>GLUSTERFS</service>
-      </requiredServices>
-
-    </service>
-    <service>
-      <name>MAPREDUCE2</name>
-      <displayName>MapReduce2</displayName>
-      <version>2.6.0.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>hadoop_2_2_*-mapreduce</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>hadoop-2-2-.*-mapreduce</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <configuration-dir>configuration-mapred</configuration-dir>   
-    </service>
-
-  </services>
-</metainfo>


[4/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/alerts.json b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/alerts.json
deleted file mode 100644
index 9599a48..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/alerts.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "KNOX": {
-    "service": [],
-    "KNOX_GATEWAY": [
-      {
-        "name": "knox_gateway_process",
-        "label": "Knox Gateway Process",
-        "interval": 1,
-        "scope": "HOST",
-        "source": {
-          "type": "PORT",
-          "uri": "{{gateway-site/gateway.port}}",
-          "default_port": 8443,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-log4j.xml
deleted file mode 100644
index 370f786..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-log4j.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <value>
-
-      # Licensed to the Apache Software Foundation (ASF) under one
-      # or more contributor license agreements. See the NOTICE file
-      # distributed with this work for additional information
-      # regarding copyright ownership. The ASF licenses this file
-      # to you under the Apache License, Version 2.0 (the
-      # "License"); you may not use this file except in compliance
-      # with the License. You may obtain a copy of the License at
-      #
-      # http://www.apache.org/licenses/LICENSE-2.0
-      #
-      # Unless required by applicable law or agreed to in writing, software
-      # distributed under the License is distributed on an "AS IS" BASIS,
-      # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      # See the License for the specific language governing permissions and
-      # limitations under the License.
-
-      app.log.dir=${launcher.dir}/../logs
-      app.log.file=${launcher.name}.log
-      app.audit.file=${launcher.name}-audit.log
-
-      log4j.rootLogger=ERROR, drfa
-
-      log4j.logger.org.apache.hadoop.gateway=INFO
-      #log4j.logger.org.apache.hadoop.gateway=DEBUG
-
-      #log4j.logger.org.eclipse.jetty=DEBUG
-      #log4j.logger.org.apache.shiro=DEBUG
-      #log4j.logger.org.apache.http=DEBUG
-      #log4j.logger.org.apache.http.client=DEBUG
-      #log4j.logger.org.apache.http.headers=DEBUG
-      #log4j.logger.org.apache.http.wire=DEBUG
-
-      log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-      log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-      log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-      log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
-      log4j.appender.drfa.File=${app.log.dir}/${app.log.file}
-      log4j.appender.drfa.DatePattern=.yyyy-MM-dd
-      log4j.appender.drfa.layout=org.apache.log4j.PatternLayout
-      log4j.appender.drfa.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-      log4j.logger.audit=INFO, auditfile
-      log4j.appender.auditfile=org.apache.log4j.DailyRollingFileAppender
-      log4j.appender.auditfile.File=${app.log.dir}/${app.audit.file}
-      log4j.appender.auditfile.Append = true
-      log4j.appender.auditfile.DatePattern = '.'yyyy-MM-dd
-      log4j.appender.auditfile.layout = org.apache.hadoop.gateway.audit.log4j.layout.AuditLayout
-
-    </value>
-    <description>
-      content for log4j.properties file for Knox.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-site.xml
deleted file mode 100644
index 4d4c4ed..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/gateway-site.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- The default settings for Knox. -->
-<!-- Edit gateway-site.xml to change settings for your local -->
-<!-- install. -->
-
-<configuration supports_final="false">
-
-    <property>
-        <name>gateway.port</name>
-        <value>8443</value>
-        <description>The HTTP port for the Gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.path</name>
-        <value>gateway</value>
-        <description>The default context path for the gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.gateway.conf.dir</name>
-        <value>deployments</value>
-        <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description>
-    </property>
-
-    <property>
-        <name>gateway.hadoop.kerberos.secured</name>
-        <value>false</value>
-        <description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with Kerberos</description>
-    </property>
-
-    <property>
-        <name>java.security.krb5.conf</name>
-        <value>/etc/knox/conf/krb5.conf</value>
-        <description>Absolute path to krb5.conf file</description>
-    </property>
-
-    <property>
-        <name>java.security.auth.login.config</name>
-        <value>/etc/knox/conf/krb5JAASLogin.conf</value>
-        <description>Absolute path to JASS login config file</description>
-    </property>
-
-    <property>
-        <name>sun.security.krb5.debug</name>
-        <value>true</value>
-        <description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description>
-    </property>
-
-</configuration>
-
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/knox-env.xml
deleted file mode 100644
index 871d0c0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/knox-env.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="true">
-    <!-- knox-env.sh -->
-
-    <property require-input="true">
-        <name>knox_master_secret</name>
-        <value></value>
-        <property-type>PASSWORD</property-type>
-        <description>password to use as the master secret</description>
-    </property>
-
-    <property>
-        <name>knox_user</name>
-        <value>knox</value>
-        <property-type>USER</property-type>
-        <description>Knox Username.</description>
-    </property>
-
-    <property>
-        <name>knox_group</name>
-        <value>knox</value>
-        <property-type>GROUP</property-type>
-        <description>Knox Group.</description>
-    </property>
-
-    <property>
-        <name>knox_pid_dir</name>
-        <value>/var/run/knox</value>
-        <description>Knox PID dir.</description>
-    </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/ldap-log4j.xml
deleted file mode 100644
index a0cf658..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/ldap-log4j.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <value>
-        # Licensed to the Apache Software Foundation (ASF) under one
-        # or more contributor license agreements.  See the NOTICE file
-        # distributed with this work for additional information
-        # regarding copyright ownership.  The ASF licenses this file
-        # to you under the Apache License, Version 2.0 (the
-        # "License"); you may not use this file except in compliance
-        # with the License.  You may obtain a copy of the License at
-        #
-        #     http://www.apache.org/licenses/LICENSE-2.0
-        #
-        # Unless required by applicable law or agreed to in writing, software
-        # distributed under the License is distributed on an "AS IS" BASIS,
-        # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        # See the License for the specific language governing permissions and
-        # limitations under the License.
-
-        app.log.dir=${launcher.dir}/../logs
-        app.log.file=${launcher.name}.log
-
-        log4j.rootLogger=ERROR, drfa
-        log4j.logger.org.apache.directory.server.ldap.LdapServer=INFO
-        log4j.logger.org.apache.directory=WARN
-
-        log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-        log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-        log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-        log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
-        log4j.appender.drfa.File=${app.log.dir}/${app.log.file}
-        log4j.appender.drfa.DatePattern=.yyyy-MM-dd
-        log4j.appender.drfa.layout=org.apache.log4j.PatternLayout
-        log4j.appender.drfa.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-    </value>
-    <description>
-      content for log4j.properties file for the demo LDAP that comes with Knox.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/topology.xml
deleted file mode 100644
index db16a21..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/topology.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-    <!-- topology file -->
-
-    <property>
-    <name>content</name>
-    <value>
-        &lt;topology&gt;
-
-            &lt;gateway&gt;
-
-                &lt;provider&gt;
-                    &lt;role&gt;authentication&lt;/role&gt;
-                    &lt;name&gt;ShiroProvider&lt;/name&gt;
-                    &lt;enabled&gt;true&lt;/enabled&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;sessionTimeout&lt;/name&gt;
-                        &lt;value&gt;30&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm&lt;/name&gt;
-                        &lt;value&gt;org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.userDnTemplate&lt;/name&gt;
-                        &lt;value&gt;uid={0},ou=people,dc=hadoop,dc=apache,dc=org&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.contextFactory.url&lt;/name&gt;
-                        &lt;value&gt;ldap://{{knox_host_name}}:33389&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.contextFactory.authenticationMechanism&lt;/name&gt;
-                        &lt;value&gt;simple&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;urls./**&lt;/name&gt;
-                        &lt;value&gt;authcBasic&lt;/value&gt;
-                    &lt;/param&gt;
-                &lt;/provider&gt;
-
-                &lt;provider&gt;
-                    &lt;role&gt;identity-assertion&lt;/role&gt;
-                    &lt;name&gt;Default&lt;/name&gt;
-                    &lt;enabled&gt;true&lt;/enabled&gt;
-                &lt;/provider&gt;
-
-            &lt;/gateway&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;NAMENODE&lt;/role&gt;
-                &lt;url&gt;hdfs://{{namenode_host}}:{{namenode_rpc_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;JOBTRACKER&lt;/role&gt;
-                &lt;url&gt;rpc://{{rm_host}}:{{jt_rpc_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHDFS&lt;/role&gt;
-                &lt;url&gt;http://{{namenode_host}}:{{namenode_http_port}}/webhdfs&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHCAT&lt;/role&gt;
-                &lt;url&gt;http://{{webhcat_server_host}}:{{templeton_port}}/templeton&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;OOZIE&lt;/role&gt;
-                &lt;url&gt;http://{{oozie_server_host}}:{{oozie_server_port}}/oozie&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHBASE&lt;/role&gt;
-                &lt;url&gt;http://{{hbase_master_host}}:{{hbase_master_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;HIVE&lt;/role&gt;
-                &lt;url&gt;http://{{hive_server_host}}:{{hive_http_port}}/{{hive_http_path}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;RESOURCEMANAGER&lt;/role&gt;
-                &lt;url&gt;http://{{rm_host}}:{{rm_port}}/ws&lt;/url&gt;
-            &lt;/service&gt;
-        &lt;/topology&gt;
-    </value>
-    <description>
-        The configuration specifies the Hadoop cluster services Knox will provide access to.
-    </description>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/users-ldif.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/users-ldif.xml
deleted file mode 100644
index ace4858..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/configuration/users-ldif.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-
-    <property>
-        <name>content</name>
-        <value>
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: 1
-
-# Please replace with site specific values
-dn: dc=hadoop,dc=apache,dc=org
-objectclass: organization
-objectclass: dcObject
-o: Hadoop
-dc: hadoop
-
-# Entry for a sample people container
-# Please replace with site specific values
-dn: ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: people
-
-# Entry for a sample end user
-# Please replace with site specific values
-dn: uid=guest,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Guest
-sn: User
-uid: guest
-userPassword:guest-password
-
-# entry for sample user admin
-dn: uid=admin,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Admin
-sn: Admin
-uid: admin
-userPassword:admin-password
-
-# entry for sample user sam
-dn: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: sam
-sn: sam
-uid: sam
-userPassword:sam-password
-
-# entry for sample user tom
-dn: uid=tom,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: tom
-sn: tom
-uid: tom
-userPassword:tom-password
-
-# create FIRST Level groups branch
-dn: ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: groups
-description: generic groups branch
-
-# create the analyst group under groups
-dn: cn=analyst,ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass: groupofnames
-cn: analyst
-description:analyst  group
-member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-member: uid=tom,ou=people,dc=hadoop,dc=apache,dc=org
-
-
-# create the scientist group under groups
-dn: cn=scientist,ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass: groupofnames
-cn: scientist
-description: scientist group
-member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-
-        </value>
-        <description>
-            content for users-ldif file for the demo LDAP that comes with Knox.
-        </description>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/metainfo.xml
deleted file mode 100644
index 90ab331..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/metainfo.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>KNOX</name>
-      <displayName>Knox</displayName>
-      <comment>Provides a single point of authentication and access for Apache Hadoop services in a cluster</comment>
-      <version>0.5.0.2.2.0.0</version>
-      <components>
-        <component>
-          <name>KNOX_GATEWAY</name>
-          <displayName>Knox Gateway</displayName>
-          <category>MASTER</category>
-          <cardinality>1+</cardinality>
-          <commandScript>
-            <script>scripts/knox_gateway.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-            <customCommands>
-                <customCommand>
-                    <name>STARTDEMOLDAP</name>
-                    <commandScript>
-                        <script>scripts/demo_ldap.py</script>
-                        <scriptType>PYTHON</scriptType>
-                        <timeout>600</timeout>
-                    </commandScript>
-                </customCommand>
-                <customCommand>
-                    <name>STOPDEMOLDAP</name>
-                    <commandScript>
-                        <script>scripts/demo_ldap.py</script>
-                        <scriptType>PYTHON</scriptType>
-                        <timeout>600</timeout>
-                    </commandScript>
-                </customCommand>
-            </customCommands>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>knox_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>knox-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-      <configuration-dependencies>
-        <config-type>gateway-site</config-type>
-        <config-type>gateway-log4j</config-type>
-        <config-type>topology</config-type>
-      </configuration-dependencies>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/files/validateKnoxStatus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/files/validateKnoxStatus.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/files/validateKnoxStatus.py
deleted file mode 100644
index 257abfb..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/files/validateKnoxStatus.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import optparse
-import socket
-
-#
-# Main.
-#
-def main():
-  parser = optparse.OptionParser(usage="usage: %prog [options]")
-  parser.add_option("-p", "--port", dest="port", help="Port for Knox process")
-  parser.add_option("-n", "--hostname", dest="hostname", help="Hostname of Knox Gateway component")
-
-  (options, args) = parser.parse_args()
-  timeout_seconds = 5
-  try:
-    s = socket.create_connection((options.hostname, int(options.port)),timeout=timeout_seconds)
-    print "Successfully connected to %s on port %s" % (options.hostname, options.port)
-    s.close()
-  except socket.error, e:
-    print "Connection to %s on port %s failed: %s" % (options.hostname, options.port, e)
-    exit(1)
-
-if __name__ == "__main__":
-  main()
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox.py
deleted file mode 100644
index 627462a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-
-def knox():
-    import params
-
-    Directory(params.knox_conf_dir,
-              owner = params.knox_user,
-              group = params.knox_group,
-              recursive = True
-    )
-
-
-    XmlConfig("gateway-site.xml",
-              conf_dir=params.knox_conf_dir,
-              configurations=params.config['configurations']['gateway-site'],
-              configuration_attributes=params.config['configuration_attributes']['gateway-site'],
-              owner=params.knox_user,
-              group=params.knox_group,
-    )
-
-    File(format("{params.knox_conf_dir}/gateway-log4j.properties"),
-         mode=0644,
-         group=params.knox_group,
-         owner=params.knox_user,
-         content=params.gateway_log4j
-    )
-
-    File(format("{params.knox_conf_dir}/topologies/default.xml"),
-         group=params.knox_group,
-         owner=params.knox_user,
-         content=InlineTemplate(params.topology_template)
-    )
-    if params.security_enabled:
-      TemplateConfig( format("{knox_conf_dir}/krb5JAASLogin.conf"),
-                      owner = params.knox_user,
-                      template_tag = None
-      )
-    cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir} {knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
-    Execute(cmd)
-
-    cmd = format('{knox_client_bin} create-master --master {knox_master_secret!p}')
-    Execute(cmd,
-            user=params.knox_user,
-            environment={'JAVA_HOME': params.java_home},
-            not_if=format('test -f {knox_master_secret_path}')
-    )
-
-    cmd = format('{knox_client_bin} create-cert --hostname {knox_host_name_in_cluster}')
-    Execute(cmd,
-            user=params.knox_user,
-            environment={'JAVA_HOME': params.java_home},
-            not_if=format('test -f {knox_cert_store_path}')
-    )
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_gateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_gateway.py
deleted file mode 100644
index 32bef64..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_gateway.py
+++ /dev/null
@@ -1,101 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-import sys
-
-from knox import knox
-from knox_ldap import ldap
-
-class KnoxGateway(Script):
-  def install(self, env):
-    self.install_packages(env)
-    import params
-    env.set_params(params)
-    cmd = format('rm -f {knox_conf_dir}/topologies/sandbox.xml')
-    Execute(cmd)
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    knox()
-    ldap()
-
-  def start(self, env):
-    import params
-    env.set_params(params)
-    self.configure(env)
-    daemon_cmd = format('{knox_bin} start')
-    no_op_test = format('ls {knox_pid_file} >/dev/null 2>&1 && ps -p `cat {knox_pid_file}` >/dev/null 2>&1')
-    Execute(daemon_cmd,
-            user=params.knox_user,
-            environment={'JAVA_HOME': params.java_home},
-            not_if=no_op_test
-    )
-
-  def stop(self, env):
-    import params
-    env.set_params(params)
-    self.configure(env)
-    daemon_cmd = format('{knox_bin} stop')
-    Execute(daemon_cmd,
-            environment={'JAVA_HOME': params.java_home},
-            user=params.knox_user,
-    )
-    Execute (format("rm -f {knox_pid_file}"))
-
-
-  def status(self, env):
-    import status_params
-    env.set_params(status_params)
-    check_process_status(status_params.knox_pid_file)
-
-
-  def configureldap(self, env):
-    import params
-    env.set_params(params)
-    ldap()
-
-  def startdemoldap(self, env):
-    import params
-    env.set_params(params)
-    self.configureldap(env)
-    daemon_cmd = format('{ldap_bin} start')
-    no_op_test = format('ls {ldap_pid_file} >/dev/null 2>&1 && ps -p `cat {ldap_pid_file}` >/dev/null 2>&1')
-    Execute(daemon_cmd,
-            user=params.knox_user,
-            environment={'JAVA_HOME': params.java_home},
-            not_if=no_op_test
-    )
-
-  def stopdemoldap(self, env):
-    import params
-    env.set_params(params)
-    self.configureldap(env)
-    daemon_cmd = format('{ldap_bin} stop')
-    Execute(daemon_cmd,
-            environment={'JAVA_HOME': params.java_home},
-            user=params.knox_user,
-            )
-    Execute (format("rm -f {ldap_pid_file}"))
-
-
-
-if __name__ == "__main__":
-  KnoxGateway().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_ldap.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_ldap.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_ldap.py
deleted file mode 100644
index 2ff8297..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/knox_ldap.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-
-def ldap():
-    import params
-
-    File(format("{params.knox_conf_dir}/ldap-log4j.properties"),
-         mode=0644,
-         group=params.knox_group,
-         owner=params.knox_user,
-         content=params.ldap_log4j
-    )
-
-    File(format("{params.knox_conf_dir}/users.ldif"),
-         mode=0644,
-         group=params.knox_group,
-         owner=params.knox_user,
-         content=params.users_ldif
-    )
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py
deleted file mode 100644
index bb2b000..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py
+++ /dev/null
@@ -1,140 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Ambari Agent
-
-"""
-
-from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions
-from resource_management import *
-import status_params
-
-config = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
-stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0
-
-if stack_is_hdp22_or_further:
-  knox_bin = '/usr/hdp/current/knox-server/bin/gateway.sh'
-  ldap_bin = '/usr/hdp/current/knox-server/bin/ldap.sh'
-  knox_client_bin = '/usr/hdp/current/knox-server/bin/knoxcli.sh'
-else:
-  knox_bin = '/usr/bin/gateway'
-  ldap_bin = '/usr/lib/knox/bin/ldap.sh'
-  knox_client_bin = '/usr/lib/knox/bin/knoxcli.sh'
-
-namenode_hosts = default("/clusterHostInfo/namenode_host", None)
-if type(namenode_hosts) is list:
-    namenode_host = namenode_hosts[0]
-else:
-    namenode_host = namenode_hosts
-
-has_namenode = not namenode_host == None
-namenode_http_port = "50070"
-namenode_rpc_port = "8020"
-
-if has_namenode:
-    if 'dfs.namenode.http-address' in config['configurations']['hdfs-site']:
-        namenode_http_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.http-address'])
-    if 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
-        namenode_rpc_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.rpc-address'])
-
-rm_hosts = default("/clusterHostInfo/rm_host", None)
-if type(rm_hosts) is list:
-    rm_host = rm_hosts[0]
-else:
-    rm_host = rm_hosts
-has_rm = not rm_host == None
-
-jt_rpc_port = "8050"
-rm_port = "8080"
-
-if has_rm:
-    if 'yarn.resourcemanager.address' in config['configurations']['yarn-site']:
-        jt_rpc_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resourcemanager.address'])
-
-    if 'yarn.resourcemanager.webapp.address' in config['configurations']['yarn-site']:
-        rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'])
-
-hive_http_port = default('/configurations/hive-site/hive.server2.thrift.http.port', "10001")
-hive_http_path = default('/configurations/hive-site/hive.server2.thrift.http.path', "cliservice")
-hive_server_hosts = default("/clusterHostInfo/hive_server_host", None)
-if type(hive_server_hosts) is list:
-    hive_server_host = hive_server_hosts[0]
-else:
-    hive_server_host = hive_server_hosts
-
-templeton_port = default('/configurations/webhcat-site/templeton.port', "50111")
-webhcat_server_hosts = default("/clusterHostInfo/webhcat_server_host", None)
-if type(webhcat_server_hosts) is list:
-    webhcat_server_host = webhcat_server_hosts[0]
-else:
-    webhcat_server_host = webhcat_server_hosts
-
-hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', "8080")
-hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
-if type(hbase_master_hosts) is list:
-    hbase_master_host = hbase_master_hosts[0]
-else:
-    hbase_master_host = hbase_master_hosts
-
-oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
-if type(oozie_server_hosts) is list:
-    oozie_server_host = oozie_server_hosts[0]
-else:
-    oozie_server_host = oozie_server_hosts
-
-has_oozie = not oozie_server_host == None
-oozie_server_port = "11000"
-
-if has_oozie:
-    if 'oozie.base.url' in config['configurations']['oozie-site']:
-        oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
-
-
-# server configurations
-knox_conf_dir = '/etc/knox/conf'
-knox_data_dir = '/var/lib/knox/data'
-knox_logs_dir = '/var/log/knox'
-knox_pid_dir = status_params.knox_pid_dir
-knox_user = default("/configurations/knox-env/knox_user", "knox")
-knox_group = default("/configurations/knox-env/knox_group", "knox")
-knox_pid_file = status_params.knox_pid_file
-ldap_pid_file = status_params.ldap_pid_file
-knox_master_secret = config['configurations']['knox-env']['knox_master_secret']
-knox_master_secret_path = '/var/lib/knox/data/security/master'
-knox_cert_store_path = '/var/lib/knox/data/security/keystores/gateway.jks'
-knox_host_name = config['clusterHostInfo']['knox_gateway_hosts'][0]
-knox_host_name_in_cluster = config['hostname']
-knox_host_port = config['configurations']['gateway-site']['gateway.port']
-topology_template = config['configurations']['topology']['content']
-gateway_log4j = config['configurations']['gateway-log4j']['content']
-ldap_log4j = config['configurations']['ldap-log4j']['content']
-users_ldif = config['configurations']['users-ldif']['content']
-java_home = config['hostLevelParams']['java_home']
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-smokeuser = config['configurations']['cluster-env']['smokeuser']
-smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-if security_enabled:
-  knox_keytab_path = config['configurations']['knox-env']['knox_keytab_path']
-  _hostname_lowercase = config['hostname'].lower()
-  knox_principal_name = config['configurations']['knox-env']['knox_principal_name'].replace('_HOST',_hostname_lowercase)
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/service_check.py
deleted file mode 100644
index 0349c24..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/service_check.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-import sys
-
-class KnoxServiceCheck(Script):
-
-    def service_check(self, env):
-        import params
-        env.set_params(params)
-
-        validateKnoxFileName = "validateKnoxStatus.py"
-        validateKnoxFilePath = format("{tmp_dir}/{validateKnoxFileName}")
-        python_executable = sys.executable
-        validateStatusCmd = format("{python_executable} {validateKnoxFilePath} -p {knox_host_port} -n {knox_host_name}")
-        if params.security_enabled:
-          kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser};")
-          smoke_cmd = format("{kinit_cmd} {validateStatusCmd}")
-        else:
-          smoke_cmd = validateStatusCmd
-
-        print "Test connectivity to knox server"
-
-
-        File(validateKnoxFilePath,
-          content=StaticFile(validateKnoxFileName),
-          mode=0755
-          )
-
-        Execute(smoke_cmd,
-          tries=3,
-          try_sleep=5,
-          path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
-          user=params.smokeuser,
-          timeout=5,
-          logoutput=True
-        )
-
-if __name__ == "__main__":
-    KnoxServiceCheck().execute()
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/status_params.py
deleted file mode 100644
index 880c617..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/status_params.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-config = Script.get_config()
-
-knox_pid_dir = config['configurations']['knox-env']['knox_pid_dir']
-knox_pid_file = format("{knox_pid_dir}/gateway.pid")
-ldap_pid_file = format("{knox_pid_dir}/ldap.pid")

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/templates/krb5JAASLogin.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/templates/krb5JAASLogin.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/templates/krb5JAASLogin.conf.j2
deleted file mode 100644
index fa3237b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/templates/krb5JAASLogin.conf.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-com.sun.security.jgss.initiate {
-com.sun.security.auth.module.Krb5LoginModule required
-renewTGT=true
-doNotPrompt=true
-useKeyTab=true
-keyTab="{{knox_keytab_path}}"
-principal="{{knox_principal_name}}"
-isInitiator=true
-storeKey=true
-useTicketCache=true
-client=true;
-};
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-env.xml
deleted file mode 100644
index 39ba798..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-env.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <!-- oozie-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for oozie-env.sh file</description>
-    <value>
-#!/bin/bash
-
-if [ -d "/usr/lib/bigtop-tomcat" ]; then
-  export OOZIE_CONFIG=${OOZIE_CONFIG:-/etc/oozie/conf}
-  export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}
-  export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}
-  export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat
-fi
-
-#Set JAVA HOME
-export JAVA_HOME={{java_home}}
-
-export JRE_HOME=${JAVA_HOME}
-
-# Set Oozie specific environment variables here.
-
-# Settings for the Embedded Tomcat that runs Oozie
-# Java System properties for Oozie should be specified in this variable
-#
-# export CATALINA_OPTS=
-
-# Oozie configuration file to load from Oozie configuration directory
-#
-# export OOZIE_CONFIG_FILE=oozie-site.xml
-
-# Oozie logs directory
-#
-export OOZIE_LOG={{oozie_log_dir}}
-
-# Oozie pid directory
-#
-export CATALINA_PID={{pid_file}}
-
-#Location of the data for oozie
-export OOZIE_DATA={{oozie_data_dir}}
-
-# Oozie Log4J configuration file to load from Oozie configuration directory
-#
-# export OOZIE_LOG4J_FILE=oozie-log4j.properties
-
-# Reload interval of the Log4J configuration file, in seconds
-#
-# export OOZIE_LOG4J_RELOAD=10
-
-# The port Oozie server runs
-#
-export OOZIE_HTTP_PORT={{oozie_server_port}}
-
-# The admin port Oozie server runs
-#
-export OOZIE_ADMIN_PORT={{oozie_server_admin_port}}
-
-# The host name Oozie server runs on
-#
-# export OOZIE_HTTP_HOSTNAME=`hostname -f`
-
-# The base URL for callback URLs to Oozie
-#
-# export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"
-export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
-
-# At least 1 minute of retry time to account for server downtime during
-# upgrade/downgrade
-export OOZIE_CLIENT_OPTS="${OOZIE_CLIENT_OPTS} -Doozie.connection.retry.count=5 "
-
-# This is needed so that Oozie does not run into OOM or GC Overhead limit
-# exceeded exceptions. If the oozie server is handling large number of
-# workflows/coordinator jobs, the memory settings may need to be revised
-export CATALINA_OPTS="${CATALINA_OPTS} -Xmx2048m -XX:MaxPermSize=256m "
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-site.xml
deleted file mode 100644
index e44cb57..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/configuration/oozie-site.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-        
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<configuration supports_final="true">
-
-  <property>
-    <name>oozie.service.coord.check.maximum.frequency</name>
-    <value>false</value>
-    <description>
-      When true, Oozie will reject any coordinators with a frequency faster than 5 minutes.  It is not recommended to disable
-      this check or submit coordinators with frequencies faster than 5 minutes: doing so can cause unintended behavior and
-      additional system stress.
-    </description>
-  </property>
-  <property>
-    <name>oozie.services</name>
-    <value>
-      org.apache.oozie.service.SchedulerService,
-      org.apache.oozie.service.InstrumentationService,
-      org.apache.oozie.service.MemoryLocksService,
-      org.apache.oozie.service.UUIDService,
-      org.apache.oozie.service.ELService,
-      org.apache.oozie.service.AuthorizationService,
-      org.apache.oozie.service.UserGroupInformationService,
-      org.apache.oozie.service.HadoopAccessorService,
-      org.apache.oozie.service.JobsConcurrencyService,
-      org.apache.oozie.service.URIHandlerService,
-      org.apache.oozie.service.DagXLogInfoService,
-      org.apache.oozie.service.SchemaService,
-      org.apache.oozie.service.LiteWorkflowAppService,
-      org.apache.oozie.service.JPAService,
-      org.apache.oozie.service.StoreService,
-      org.apache.oozie.service.CoordinatorStoreService,
-      org.apache.oozie.service.SLAStoreService,
-      org.apache.oozie.service.DBLiteWorkflowStoreService,
-      org.apache.oozie.service.CallbackService,
-      org.apache.oozie.service.ShareLibService,
-      org.apache.oozie.service.CallableQueueService,
-      org.apache.oozie.service.ActionService,
-      org.apache.oozie.service.ActionCheckerService,
-      org.apache.oozie.service.RecoveryService,
-      org.apache.oozie.service.PurgeService,
-      org.apache.oozie.service.CoordinatorEngineService,
-      org.apache.oozie.service.BundleEngineService,
-      org.apache.oozie.service.DagEngineService,
-      org.apache.oozie.service.CoordMaterializeTriggerService,
-      org.apache.oozie.service.StatusTransitService,
-      org.apache.oozie.service.PauseTransitService,
-      org.apache.oozie.service.GroupsService,
-      org.apache.oozie.service.ProxyUserService,
-      org.apache.oozie.service.XLogStreamingService,
-      org.apache.oozie.service.JvmPauseMonitorService
-    </value>
-    <description>
-      All services to be created and managed by Oozie Services singleton.
-      Class names must be separated by commas.
-    </description>
-  </property>
-
-  <property>
-    <name>oozie.service.SchemaService.wf.ext.schemas</name>
-    <value>shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd</value>
-  </property>
-
-  <property>
-    <name>oozie.service.AuthorizationService.security.enabled</name>
-    <value>true</value>
-    <description>
-      Specifies whether security (user name/admin role) is enabled or not.
-      If disabled any user can manage Oozie system and manage any job.
-    </description>
-  </property>
-
-  <property>
-    <name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
-    <value>false</value>
-    <description>
-      Indicates if Oozie is configured to use Kerberos.
-    </description>
-  </property>
-
-  <property>
-    <name>oozie.authentication.simple.anonymous.allowed</name>
-    <value>true</value>
-    <description>
-      Indicates if anonymous requests are allowed.
-      This setting is meaningful only when using 'simple' authentication.
-    </description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/metainfo.xml
deleted file mode 100644
index 694be1b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/OOZIE/metainfo.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>OOZIE</name>
-      <version>4.1.0.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>zip</name>
-            </package>
-            <package>
-              <name>mysql-connector-java</name>
-            </package>
-            <package>
-              <name>extjs</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>oozie_2_2_*</name>
-            </package>
-            <package>
-              <name>falcon_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>oozie-2-2-.*</name>
-            </package>
-            <package>
-              <name>falcon-2-2-.*</name>
-            </package>
-            <package>
-              <name>extjs</name>
-            </package>
-            <package>
-              <name>libxml2-utils</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/PIG/metainfo.xml
deleted file mode 100644
index ed1f583..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/PIG/metainfo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>PIG</name>
-      <displayName>Pig</displayName>
-      <version>0.14.0.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>pig_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>pig-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <requiredServices>
-        <service>TEZ</service>
-      </requiredServices>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-client.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-client.xml
deleted file mode 100644
index 028c847..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-client.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration supports_final="true">
-
-  <!--
-    <property>
-      <name>slider.security.protocol.acl</name>
-      <value>*</value>
-      <description>When security is enabled, set appropriate acl. Default value means allow everyone.</description>
-    </property>
-    -->
-
-  <!--
-     The recommended approach is to configure slider-env.sh and set HADOOP_CONF_DIR.
-     Otherwise, appropriate configurations from hdfs-site, yarn-site, can be dropped in this file
-     for Slider client to work. The following list is not an exhaustive list but the minimal config
-     needed to interact with a non-secure cluster.
-  -->
-
-  <!--
-      <property>
-        <name>yarn.resourcemanager.address</name>
-        <value>localhost:8050</value>
-        <description>The address of the applications manager interface in the RM.</description>
-      </property>
-
-      <property>
-        <name>yarn.resourcemanager.scheduler.address</name>
-        <value>localhost:8030</value>
-        <description>The address of the scheduler interface.</description>
-      </property>
-
-      <property>
-        <name>fs.defaultFS</name>
-        <value>hdfs://localhost:8020</value>
-        <description>The name of the default file system.  Either the
-          literal string "local" or a host:port for HDFS.</description>
-      </property>
-    -->
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-env.xml
deleted file mode 100644
index 80c3af1..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-env.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <!-- slider-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for slider-env.sh file</description>
-    <value>
-# Set Slider-specific environment variables here.
-
-# The only required environment variable is JAVA_HOME.  All others are
-# optional.  When running a distributed configuration it is best to
-# set JAVA_HOME in this file, so that it is correctly defined on
-# remote nodes.
-
-# The java implementation to use.  Required.
-export JAVA_HOME={{java64_home}}
-# The hadoop conf directory.  Optional as slider-client.xml can be edited to add properties.
-export HADOOP_CONF_DIR={{hadoop_conf_dir}}
-    </value>
-  </property>
-  
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-log4j.xml
deleted file mode 100644
index 709867c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/configuration/slider-log4j.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Define some default values that can be overridden by system properties
-log4j.rootLogger=INFO,stdout
-log4j.threshhold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# log layout skips stack-trace creation operations by avoiding line numbers and method
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} - %m%n
-
-# debug edition is much more expensive
-#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
-
-
-log4j.appender.subprocess=org.apache.log4j.ConsoleAppender
-log4j.appender.subprocess.layout=org.apache.log4j.PatternLayout
-log4j.appender.subprocess.layout.ConversionPattern=[%c{1}]: %m%n
-#log4j.logger.org.apache.slider.yarn.appmaster.SliderAppMasterer.master=INFO,subprocess
-
-# for debugging Slider
-#log4j.logger.org.apache.slider=DEBUG
-#log4j.logger.org.apache.slider=DEBUG
-
-# uncomment to debug service lifecycle issues
-#log4j.logger.org.apache.hadoop.yarn.service.launcher=DEBUG
-#log4j.logger.org.apache.hadoop.yarn.service=DEBUG
-
-# uncomment for YARN operations
-#log4j.logger.org.apache.hadoop.yarn.client=DEBUG
-
-# uncomment this to debug security problems
-#log4j.logger.org.apache.hadoop.security=DEBUG
-
-#crank back on some noise
-log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
-log4j.logger.org.apache.hadoop.hdfs=WARN
-
-
-log4j.logger.org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor=WARN
-log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdaterImpl=WARN
-log4j.logger.org.apache.zookeeper=WARN
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/metainfo.xml
deleted file mode 100644
index cf91709..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/metainfo.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>SLIDER</name>
-      <displayName>Slider</displayName>
-      <comment>A framework for deploying, managing and monitoring existing distributed applications on YARN.</comment>
-      <version>0.60.0.2.2.0.0</version>
-      <components>
-        <component>
-          <name>SLIDER</name>
-          <displayName>Slider</displayName>
-          <category>CLIENT</category>
-          <cardinality>0+</cardinality>
-          <dependencies>
-            <dependency>
-              <name>GLUSTERFS/GLUSTERFS_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>YARN/YARN_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-          </dependencies>
-          <commandScript>
-            <script>scripts/slider_client.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-          <configFiles>
-            <configFile>
-              <type>xml</type>
-              <fileName>slider-client.xml</fileName>
-              <dictionaryName>slider-client</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>
-            <configFile>
-              <type>xml</type>
-              <fileName>yarn-site.xml</fileName>
-              <dictionaryName>yarn-site</dictionaryName>
-            </configFile>
-            <configFile>
-              <type>env</type>
-              <fileName>slider-env.sh</fileName>
-              <dictionaryName>slider-env</dictionaryName>
-            </configFile>
-            <configFile>
-              <type>env</type>
-              <fileName>log4j.properties</fileName>
-              <dictionaryName>slider-log4j</dictionaryName>
-            </configFile>
-          </configFiles>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>slider_2_2_*</name>
-            </package>
-            <package>
-              <name>storm_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>slider-2-2-.*</name>
-            </package>
-            <package>
-              <name>storm-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-
-      <requiredServices>
-        <service>YARN</service>
-        <service>GLUSTERFS</service>
-        <service>ZOOKEEPER</service>
-      </requiredServices>
-
-      <configuration-dependencies>
-        <config-type>slider-log4j</config-type>
-        <config-type>slider-client</config-type>
-        <config-type>slider-env</config-type>
-      </configuration-dependencies>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/files/hbaseSmokeVerify.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/files/hbaseSmokeVerify.sh b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/files/hbaseSmokeVerify.sh
deleted file mode 100644
index 5c320c0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/files/hbaseSmokeVerify.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-conf_dir=$1
-data=$2
-hbase_cmd=$3
-echo "scan 'ambarismoketest'" | $hbase_cmd --config $conf_dir shell > /tmp/hbase_chk_verify
-cat /tmp/hbase_chk_verify
-echo "Looking for $data"
-grep -q $data /tmp/hbase_chk_verify
-if [ "$?" -ne 0 ]
-then
-  exit 1
-fi
-
-grep -q '1 row(s)' /tmp/hbase_chk_verify

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/__init__.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/__init__.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/__init__.py
deleted file mode 100644
index 5561e10..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py
deleted file mode 100644
index 5c5d7f7..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions
-from resource_management import *
-
-# server configurations
-config = Script.get_config()
-
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
-stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0
-
-#hadoop params
-if stack_is_hdp22_or_further:
-  slider_bin_dir = '/usr/hdp/current/slider-client/bin'
-else:
-  slider_bin_dir = "/usr/lib/slider/bin"
-
-slider_conf_dir = "/etc/slider/conf"
-hadoop_conf_dir = "/etc/hadoop/conf"
-smokeuser = config['configurations']['cluster-env']['smokeuser']
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-slider_env_sh_template = config['configurations']['slider-env']['content']
-
-java64_home = config['hostLevelParams']['java_home']
-log4j_props = config['configurations']['slider-log4j']['content']
-slider_cmd = format("{slider_bin_dir}/slider")
-storm_slider_conf_dir= '/usr/hdp/current/storm-slider-client/conf'
-slider_home_dir= '/usr/hdp/current/slider-client'

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/service_check.py
deleted file mode 100644
index bb54dc8..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/service_check.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-
-class SliderServiceCheck(Script):
-  def service_check(self, env):
-    import params
-
-    env.set_params(params)
-
-    smokeuser_kinit_cmd = format(
-      "{kinit_path_local} -kt {smokeuser_keytab} {smokeuser};") if params.security_enabled else ""
-
-    servicecheckcmd = format("{smokeuser_kinit_cmd} {slider_cmd} list")
-
-    Execute(servicecheckcmd,
-            tries=3,
-            try_sleep=5,
-            user=params.smokeuser,
-            logoutput=True
-    )
-
-
-if __name__ == "__main__":
-  SliderServiceCheck().execute()
-  


[6/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml
deleted file mode 100644
index 88fc999..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml
+++ /dev/null
@@ -1,1119 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<configuration supports_final="true">
-
-  <property>
-    <name>hive.cbo.enable</name>
-    <value>true</value>
-    <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
-  </property>
-
-  <property>
-    <name>hive.zookeeper.quorum</name>
-    <value>localhost:2181</value>
-    <description>List of ZooKeeper servers to talk to. This is needed for: 1.
-      Read/write locks - when hive.lock.manager is set to
-      org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
-      2. When HiveServer2 supports service discovery via Zookeeper.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.connect.retries</name>
-    <value>24</value>
-    <description>Number of retries while opening a connection to metastore</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.failure.retries</name>
-    <value>24</value>
-    <description>Number of retries upon failure of Thrift metastore calls</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.client.connect.retry.delay</name>
-    <value>5s</value>
-    <description>
-      Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
-      Number of seconds for the client to wait between consecutive connection attempts
-    </description>
-  </property>
-
-  <property>
-    <name>hive.metastore.client.socket.timeout</name>
-    <value>1800s</value>
-    <description>
-      Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
-      MetaStore Client socket timeout in seconds
-    </description>
-  </property>
-
-  <property>
-    <name>hive.mapjoin.bucket.cache.size</name>
-    <value>10000</value>
-    <description/>
-  </property>
-
-  <property>
-    <name>hive.security.authorization.manager</name>
-    <value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory</value>
-    <description>
-      The Hive client authorization manager class name. The user defined authorization class should implement
-      interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.cluster.delegation.token.store.class</name>
-    <value>org.apache.hadoop.hive.thrift.ZooKeeperTokenStore</value>
-    <description>The delegation token store implementation.
-      Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster.</description>
-  </property>
-  
-  <property>
-    <name>hive.cluster.delegation.token.store.zookeeper.connectString</name>
-    <value>localhost:2181</value>
-    <description>The ZooKeeper token store connect string.</description>
-  </property>
-
-  <property>
-    <name>hive.server2.support.dynamic.service.discovery</name>
-    <value>true</value>
-    <description>Whether HiveServer2 supports dynamic service discovery for its clients.
-      To support this, each instance of HiveServer2 currently uses ZooKeeper to register itself,
-      when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum
-      in their connection string.
-    </description>
-  </property>
-  
-  <property>
-    <name>fs.hdfs.impl.disable.cache</name>
-    <value>false</value>
-    <deleted>true</deleted>
-    <description>Disable HDFS filesystem cache.</description>
-  </property>
-
-  <property>
-    <name>fs.file.impl.disable.cache</name>
-    <value>false</value>
-    <deleted>true</deleted>
-    <description>Disable local filesystem cache.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.scratchdir</name>
-    <value>/tmp/hive</value>
-    <description>HDFS root scratch dir for Hive jobs which gets created with write all (733) permission. For each connecting user, an HDFS scratch dir: ${hive.exec.scratchdir}/&lt;username&gt; is created, with ${hive.scratch.dir.permission}.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.submitviachild</name>
-    <value>false</value>
-    <description/>
-  </property>
-
-  <property>
-    <name>hive.exec.submit.local.task.via.child</name>
-    <value>true</value>
-    <description>
-      Determines whether local tasks (typically mapjoin hashtable generation phase) runs in
-      separate JVM (true recommended) or not.
-      Avoids the overhead of spawning new JVM, but can lead to out-of-memory issues.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.compress.output</name>
-    <value>false</value>
-    <description>
-      This controls whether the final outputs of a query (to a local/HDFS file or a Hive table) is compressed.
-      The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.compress.intermediate</name>
-    <value>false</value>
-    <description>
-      This controls whether intermediate files produced by Hive between multiple map-reduce jobs are compressed.
-      The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.reducers.bytes.per.reducer</name>
-    <value>67108864</value>
-    <description>Defines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.reducers.max</name>
-    <value>1009</value>
-    <description>
-      max number of reducers will be used. If the one specified in the configuration parameter mapred.reduce.tasks is
-      negative, Hive will use this one as the max number of reducers when automatically determine number of reducers.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.pre.hooks</name>
-    <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
-    <description>
-      Comma-separated list of pre-execution hooks to be invoked for each statement.
-      A pre-execution hook is specified as the name of a Java class which implements the
-      org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.post.hooks</name>
-    <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
-    <description>
-      Comma-separated list of post-execution hooks to be invoked for each statement.
-      A post-execution hook is specified as the name of a Java class which implements the
-      org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.failure.hooks</name>
-    <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
-    <description>
-      Comma-separated list of on-failure hooks to be invoked for each statement.
-      An on-failure hook is specified as the name of Java class which implements the
-      org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.parallel</name>
-    <value>false</value>
-    <description>Whether to execute jobs in parallel</description>
-  </property>
-
-  <property>
-    <name>hive.exec.parallel.thread.number</name>
-    <value>8</value>
-    <description>How many jobs at most can be executed in parallel</description>
-  </property>
-
-  <property>
-    <name>hive.mapred.reduce.tasks.speculative.execution</name>
-    <value>false</value>
-    <description>Whether speculative execution for reducers should be turned on. </description>
-  </property>
-
-  <property>
-    <name>hive.exec.dynamic.partition</name>
-    <value>true</value>
-    <description>Whether or not to allow dynamic partitions in DML/DDL.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.dynamic.partition.mode</name>
-    <value>nonstrict</value>
-    <description>
-      In strict mode, the user must specify at least one static partition
-      in case the user accidentally overwrites all partitions.
-      NonStrict allows all partitions of a table to be dynamic.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.max.dynamic.partitions</name>
-    <value>5000</value>
-    <description>Maximum number of dynamic partitions allowed to be created in total.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.max.dynamic.partitions.pernode</name>
-    <value>2000</value>
-    <description>Maximum number of dynamic partitions allowed to be created in each mapper/reducer node.</description>
-  </property>
-
-  <property>
-    <name>hive.exec.max.created.files</name>
-    <value>100000</value>
-    <description>Maximum number of HDFS files created by all mappers/reducers in a MapReduce job.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.warehouse.dir</name>
-    <value>/apps/hive/warehouse</value>
-    <description>location of default database for the warehouse</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.uris</name>
-    <value>thrift://localhost:9083</value>
-    <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
-  </property>
-
-  <property>
-    <name>javax.jdo.option.ConnectionPassword</name>
-    <value></value>
-    <description>password to use against metastore database</description>
-  </property>
-
-  <property>
-    <name>javax.jdo.option.ConnectionURL</name>
-    <value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
-    <description>JDBC connect string for a JDBC metastore</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.server.max.threads</name>
-    <value>100000</value>
-    <description>Maximum number of worker threads in the Thrift server's pool.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.kerberos.keytab.file</name>
-    <value>/etc/security/keytabs/hive.service.keytab</value>
-    <description>The path to the Kerberos Keytab file containing the metastore Thrift server's service principal.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.kerberos.principal</name>
-    <value>hive/_HOST@EXAMPLE.COM</value>
-    <description>
-      The service principal for the metastore Thrift server.
-      The special string _HOST will be replaced automatically with the correct host name.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.cluster.delegation.token.store.zookeeper.znode</name>
-    <value>/hive/cluster/delegation</value>
-    <description>The root path for token store data.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.cache.pinobjtypes</name>
-    <value>Table,Database,Type,FieldSchema,Order</value>
-    <description>List of comma separated metastore object types that should be pinned in the cache</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.pre.event.listeners</name>
-    <value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
-    <description>List of comma separated listeners for metastore events.</description>
-  </property>
-
-  <property>
-    <name>hive.metastore.authorization.storage.checks</name>
-    <value>false</value>
-    <description>
-      Should the metastore do authorization checks against the underlying storage (usually hdfs)
-      for operations like drop-partition (disallow the drop-partition if the user in
-      question doesn't have permissions to delete the corresponding directory
-      on the storage).
-    </description>
-  </property>
-
-  <property>
-    <name>javax.jdo.option.ConnectionDriverName</name>
-    <value>com.mysql.jdbc.Driver</value>
-    <description>Driver class name for a JDBC metastore</description>
-  </property>
-
-  <property>
-    <name>javax.jdo.option.ConnectionUserName</name>
-    <value>hive</value>
-    <description>Username to use against metastore database</description>
-  </property>
-
-  <property>
-    <name>hive.map.aggr</name>
-    <value>true</value>
-    <description>Whether to use map-side aggregation in Hive Group By queries</description>
-  </property>
-
-  <property>
-    <name>hive.cbo.enable</name>
-    <value>true</value>
-    <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
-  </property>
-
-  <property>
-    <name>hive.mapjoin.optimized.hashtable</name>
-    <value>true</value>
-    <description>
-      Whether Hive should use memory-optimized hash table for MapJoin. Only works on Tez,
-      because memory-optimized hashtable cannot be serialized.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.smbjoin.cache.rows</name>
-    <value>10000</value>
-    <description>How many rows with the same key value should be cached in memory per smb joined table.</description>
-  </property>
-
-  <property>
-    <name>hive.map.aggr.hash.percentmemory</name>
-    <value>0.5</value>
-    <description>Portion of total memory to be used by map-side group aggregation hash table</description>
-  </property>
-
-  <property>
-    <name>hive.map.aggr.hash.force.flush.memory.threshold</name>
-    <value>0.9</value>
-    <description>
-      The max memory to be used by map-side group aggregation hash table.
-      If the memory usage is higher than this number, force to flush data
-    </description>
-  </property>
-
-  <property>
-    <name>hive.map.aggr.hash.min.reduction</name>
-    <value>0.5</value>
-    <description>
-      Hash aggregation will be turned off if the ratio between hash  table size and input rows is bigger than this number.
-      Set to 1 to make sure hash aggregation is never turned off.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.merge.mapfiles</name>
-    <value>true</value>
-    <description>Merge small files at the end of a map-only job</description>
-  </property>
-
-  <property>
-    <name>hive.merge.mapredfiles</name>
-    <value>false</value>
-    <description>Merge small files at the end of a map-reduce job</description>
-  </property>
-
-  <property>
-    <name>hive.merge.tezfiles</name>
-    <value>false</value>
-    <description>Merge small files at the end of a Tez DAG</description>
-  </property>
-
-  <property>
-    <name>hive.merge.size.per.task</name>
-    <value>256000000</value>
-    <description>Size of merged files at the end of the job</description>
-  </property>
-
-  <property>
-    <name>hive.merge.smallfiles.avgsize</name>
-    <value>16000000</value>
-    <description>
-      When the average output file size of a job is less than this number, Hive will start an additional
-      map-reduce job to merge the output files into bigger files. This is only done for map-only jobs
-      if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.merge.rcfile.block.level</name>
-    <value>true</value>
-    <description/>
-  </property>
-
-  <property>
-    <name>hive.merge.orcfile.stripe.level</name>
-    <value>true</value>
-    <description>
-      When hive.merge.mapfiles or hive.merge.mapredfiles is enabled while writing a
-      table with ORC file format, enabling this config will do stripe level fast merge
-      for small ORC files. Note that enabling this config will not honor padding tolerance
-      config (hive.exec.orc.block.padding.tolerance).
-    </description>
-  </property>
-
-  <property>
-    <name>hive.exec.orc.default.stripe.size</name>
-    <value>67108864</value>
-    <description>Define the default ORC stripe size</description>
-  </property>
-
-  <property>
-    <name>hive.exec.orc.default.compress</name>
-    <value>ZLIB</value>
-    <description>Define the default compression codec for ORC file</description>
-  </property>
-
-  <property>
-    <name>hive.exec.orc.compression.strategy</name>
-    <value>SPEED</value>
-    <description>
-      Expects one of [speed, compression].
-      Define the compression strategy to use while writing data.
-      This changes the compression level of higher level compression codec (like ZLIB).
-    </description>
-  </property>
-
-  <property>
-    <name>hive.orc.splits.include.file.footer</name>
-    <value>false</value>
-    <description>
-      If turned on splits generated by orc will include metadata about the stripes in the file. This
-      data is read remotely (from the client or HS2 machine) and sent to all the tasks.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.orc.compute.splits.num.threads</name>
-    <value>10</value>
-    <description>How many threads orc should use to create splits in parallel.</description>
-  </property>
-
-  <property>
-    <name>hive.auto.convert.join</name>
-    <value>true</value>
-    <description>Whether Hive enables the optimization about converting common join into mapjoin based on the input file size</description>
-  </property>
-  <property>
-    <name>hive.auto.convert.join.noconditionaltask</name>
-    <value>true</value>
-    <description>
-      Whether Hive enables the optimization about converting common join into mapjoin based on the input file size.
-      If this parameter is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the
-      specified size, the join is directly converted to a mapjoin (there is no conditional task).
-    </description>
-  </property>
-
-  <property>
-    <name>hive.limit.optimize.enable</name>
-    <value>true</value>
-    <description>Whether to enable to optimization to trying a smaller subset of data for simple LIMIT first.</description>
-  </property>
-
-  <property>
-    <name>hive.tez.cpu.vcores</name>
-    <value>-1</value>
-    <description>By default Tez will ask for however many cpus map-reduce is configured to use per container. This can be used to overwrite.</description>
-  </property>
-
-  <property>
-    <name>hive.tez.log.level</name>
-    <value>INFO</value>
-    <description>
-      The log level to use for tasks executing as part of the DAG.
-      Used only if hive.tez.java.opts is used to configure Java options.
-    </description>
-  </property>
-  <property>
-    <name>hive.enforce.bucketing</name>
-    <value>true</value>
-    <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
-  </property>
-  <property>
-    <name>hive.enforce.sorting</name>
-    <value>true</value>
-    <description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description>
-  </property>
-
-
-  <property>
-    <name>hive.enforce.sortmergebucketmapjoin</name>
-    <value>true</value>
-    <description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not ?</description>
-  </property>
-
-  <property>
-    <name>hive.auto.convert.sortmerge.join</name>
-    <value>true</value>
-    <description>Will the join be automatically converted to a sort-merge join, if the joined tables pass the criteria for sort-merge join.</description>
-  </property>
-
-  <property>
-    <name>hive.auto.convert.sortmerge.join.to.mapjoin</name>
-    <value>false</value>
-    <description>
-      If hive.auto.convert.sortmerge.join is set to true, and a join was converted to a sort-merge join,
-      this parameter decides whether each table should be tried as a big table, and effectively a map-join should be
-      tried. That would create a conditional task with n+1 children for a n-way join (1 child for each table as the
-      big table), and the backup task will be the sort-merge join. In some cases, a map-join would be faster than a
-      sort-merge join, if there is no advantage of having the output bucketed and sorted. For example, if a very big sorted
-      and bucketed table with few files (say 10 files) are being joined with a very small sorter and bucketed table
-      with few files (10 files), the sort-merge join will only use 10 mappers, and a simple map-only join might be faster
-      if the complete small table can fit in memory, and a map-join can be performed.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.optimize.constant.propagation</name>
-    <value>true</value>
-    <description>Whether to enable constant propagation optimizer</description>
-  </property>
-  <property>
-    <name>hive.optimize.metadataonly</name>
-    <value>true</value>
-    <description/>
-  </property>
-  <property>
-    <name>hive.optimize.null.scan</name>
-    <value>true</value>
-    <description>Dont scan relations which are guaranteed to not generate any rows</description>
-  </property>
-
-
-  <property>
-    <name>hive.optimize.bucketmapjoin</name>
-    <value>true</value>
-    <description>Whether to try bucket mapjoin</description>
-  </property>
-
-  <property>
-    <name>hive.optimize.reducededuplication</name>
-    <value>true</value>
-    <description>
-      Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again.
-      This should always be set to true. Since it is a new feature, it has been made configurable.
-    </description>
-  </property>
-  <property>
-    <name>hive.optimize.reducededuplication.min.reducer</name>
-    <value>4</value>
-    <description>
-      Reduce deduplication merges two RSs by moving key/parts/reducer-num of the child RS to parent RS.
-      That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
-      The optimization will be automatically disabled if number of reducers would be less than specified value.
-    </description>
-  </property>
-  <property>
-    <name>hive.optimize.sort.dynamic.partition</name>
-    <value>false</value>
-    <description>
-      When enabled dynamic partitioning column will be globally sorted.
-      This way we can keep only one record writer open for each partition value
-      in the reducer thereby reducing the memory pressure on reducers.
-    </description>
-  </property>
-  <property>
-    <name>hive.stats.autogather</name>
-    <value>true</value>
-    <description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
-  </property>
-  <property>
-    <name>hive.stats.dbclass</name>
-    <value>fs</value>
-    <description>
-      Expects one of the pattern in [jdbc(:.*), hbase, counter, custom, fs].
-      The storage that stores temporary Hive statistics. Currently, jdbc, hbase, counter and custom type are supported.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.stats.fetch.partition.stats</name>
-    <value>true</value>
-    <description>
-      Annotation of operator tree with statistics information requires partition level basic
-      statistics like number of rows, data size and file size. Partition statistics are fetched from
-      metastore. Fetching partition statistics for each needed partition can be expensive when the
-      number of partitions is high. This flag can be used to disable fetching of partition statistics
-      from metastore. When this flag is disabled, Hive will make calls to filesystem to get file sizes
-      and will estimate the number of rows from row schema.
-    </description>
-  </property>
-  <property>
-    <name>hive.stats.fetch.column.stats</name>
-    <value>false</value>
-    <description>
-      Annotation of operator tree with statistics information requires column statistics.
-      Column statistics are fetched from metastore. Fetching column statistics for each needed column
-      can be expensive when the number of columns is high. This flag can be used to disable fetching
-      of column statistics from metastore.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.zookeeper.client.port</name>
-    <value>2181</value>
-    <description>The port of ZooKeeper servers to talk to. If the list of Zookeeper servers specified in hive.zookeeper.quorum,does not contain port numbers, this value is used.</description>
-  </property>
-
-  <property>
-    <name>hive.zookeeper.namespace</name>
-    <value>hive_zookeeper_namespace</value>
-    <description>The parent node under which all ZooKeeper nodes are created.</description>
-  </property>
-
-  <property>
-    <name>hive.txn.manager</name>
-    <value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
-    <description/>
-  </property>
-
-  <property>
-    <name>hive.txn.max.open.batch</name>
-    <value>1000</value>
-    <description>
-      Maximum number of transactions that can be fetched in one call to open_txns().
-      Increasing this will decrease the number of delta files created when
-      streaming data into Hive.  But it will also increase the number of
-      open transactions at any given time, possibly impacting read performance.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.support.concurrency</name>
-    <value>false</value>
-    <description>
-      Support concurrency and use locks, needed for Transactions. Requires Zookeeper.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.cli.print.header</name>
-    <value>false</value>
-    <description>
-      Whether to print the names of the columns in query output.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.compactor.worker.timeout</name>
-    <value>86400L</value>
-    <description>
-      Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
-      Time before a given compaction in working state is declared a failure
-      and returned to the initiated state.
-    </description>
-  </property>
-  <property>
-    <name>hive.compactor.check.interval</name>
-    <value>300L</value>
-    <description>
-      Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
-      Time between checks to see if any partitions need compacted.
-      This should be kept high because each check for compaction requires many calls against the NameNode.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.compactor.delta.pct.threshold</name>
-    <value>0.1f</value>
-    <description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
-  </property>
-  <property>
-    <name>hive.fetch.task.conversion</name>
-    <value>more</value>
-    <description>
-      Expects one of [none, minimal, more].
-      Some select queries can be converted to single FETCH task minimizing latency.
-      Currently the query should be single sourced not having any subquery and should not have
-      any aggregations or distincts (which incurs RS), lateral views and joins.
-      0. none : disable hive.fetch.task.conversion
-      1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only
-      2. more    : SELECT, FILTER, LIMIT only (support TABLESAMPLE and virtual columns)
-    </description>
-  </property>
-  <property>
-    <name>hive.fetch.task.conversion.threshold</name>
-    <value>1073741824</value>
-    <description>
-      Input threshold for applying hive.fetch.task.conversion. If target table is native, input length
-      is calculated by summation of file lengths. If it's not native, storage handler for the table
-      can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
-    </description>
-  </property>
-  <property>
-    <name>hive.fetch.task.aggr</name>
-    <value>false</value>
-    <description>
-      Aggregation queries with no group-by clause (for example, select count(*) from src) execute
-      final aggregations in single reduce task. If this is set true, Hive delegates final aggregation
-      stage to fetch task, possibly decreasing the query time.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.security.authorization.enabled</name>
-    <value>false</value>
-    <description>enable or disable the Hive client authorization</description>
-  </property>
-
-  <property>
-    <name>hive.security.authenticator.manager</name>
-    <value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value>
-    <description>
-      hive client authenticator manager class name. The user defined authenticator should implement
-      interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
-    </description>
-  </property>
-  <property>
-    <name>hive.security.metastore.authorization.manager</name>
-    <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly</value>
-    <description>
-      authorization manager class name to be used in the metastore for authorization.
-      The user defined authorization class should implement interface
-      org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider.
-    </description>
-  </property>
-  <property>
-    <name>hive.security.metastore.authorization.auth.reads</name>
-    <value>true</value>
-    <description>If this is true, metastore authorizer authorizes read actions on database, table</description>
-  </property>
-  <property>
-    <name>hive.security.metastore.authenticator.manager</name>
-    <value>org.apache.hadoop.hive.ql.security.HadoopDefaultMetastoreAuthenticator</value>
-    <description>
-      authenticator manager class name to be used in the metastore for authentication.
-      The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.logging.operation.enabled</name>
-    <value>true</value>
-    <description>When true, HS2 will save operation logs</description>
-  </property>
-  <property>
-    <name>hive.server2.logging.operation.log.location</name>
-    <value>${system:java.io.tmpdir}/${system:user.name}/operation_logs</value>
-    <description>Top level directory where operation logs are stored if logging functionality is enabled</description>
-  </property>
-
-  <property>
-    <name>hive.server2.zookeeper.namespace</name>
-    <value>hiveserver2</value>
-    <description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
-  </property>
-
-  <property>
-    <name>hive.server2.transport.mode</name>
-    <value>binary</value>
-    <description>
-      Expects one of [binary, http].
-      Transport mode of HiveServer2.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.thrift.http.port</name>
-    <value>10001</value>
-    <description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
-  </property>
-  <property>
-    <name>hive.server2.thrift.http.path</name>
-    <value>cliservice</value>
-    <description>Path component of URL endpoint when in HTTP mode.</description>
-  </property>
-
-  <property>
-    <name>hive.server2.thrift.port</name>
-    <value>10000</value>
-    <description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'binary'.</description>
-  </property>
-  <property>
-    <name>hive.server2.thrift.sasl.qop</name>
-    <value>auth</value>
-    <description>
-      Expects one of [auth, auth-int, auth-conf].
-      Sasl QOP value; Set it to one of following values to enable higher levels of
-      protection for HiveServer2 communication with clients.
-      "auth" - authentication only (default)
-      "auth-int" - authentication plus integrity protection
-      "auth-conf" - authentication plus integrity and confidentiality protection
-      This is applicable only if HiveServer2 is configured to use Kerberos authentication.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.thrift.max.worker.threads</name>
-    <value>500</value>
-    <description>Maximum number of Thrift worker threads</description>
-  </property>
-
-  <property>
-    <name>hive.server2.allow.user.substitution</name>
-    <value>true</value>
-    <description>Allow alternate user to be specified as part of HiveServer2 open connection request.</description>
-  </property>
-
-  <property>
-    <name>hive.server2.authentication.spnego.keytab</name>
-    <value>HTTP/_HOST@EXAMPLE.COM</value>
-    <description>
-      keytab file for SPNego principal, optional,
-      typical value would look like /etc/security/keytabs/spnego.service.keytab,
-      This keytab would be used by HiveServer2 when Kerberos security is enabled and
-      HTTP transport mode is used.
-      This needs to be set only if SPNEGO is to be used in authentication.
-      SPNego authentication would be honored only if valid
-      hive.server2.authentication.spnego.principal
-      and
-      hive.server2.authentication.spnego.keytab
-      are specified.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.authentication</name>
-    <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
-    <value>NONE</value>
-  </property>
-
-  <property>
-    <name>hive.server2.authentication.spnego.principal</name>
-    <value>/etc/security/keytabs/spnego.service.keytab</value>
-    <description>
-      SPNego service principal, optional,
-      typical value would look like HTTP/_HOST@EXAMPLE.COM
-      SPNego service principal would be used by HiveServer2 when Kerberos security is enabled
-      and HTTP transport mode is used.
-      This needs to be set only if SPNEGO is to be used in authentication.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.enable.doAs</name>
-    <value>true</value>
-    <description>
-      Setting this property to true will have HiveServer2 execute
-      Hive operations as the user making the calls to it.
-    </description>
-  </property>
-  <property>
-    <name>hive.server2.table.type.mapping</name>
-    <value>CLASSIC</value>
-    <description>
-      Expects one of [classic, hive].
-      This setting reflects how HiveServer2 will report the table types for JDBC and other
-      client implementations that retrieve the available tables and supported table types
-      HIVE : Exposes Hive's native table types like MANAGED_TABLE, EXTERNAL_TABLE, VIRTUAL_VIEW
-      CLASSIC : More generic types like TABLE and VIEW
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.use.SSL</name>
-    <value>false</value>
-    <description/>
-  </property>
-
-  <property>
-    <name>hive.conf.restricted.list</name>
-    <value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
-    <description>Comma separated list of configuration options which are immutable at runtime</description>
-  </property>
-
-  <property>
-    <name>hive.user.install.directory</name>
-    <value>/user/</value>
-    <description>
-      If hive (in tez mode only) cannot find a usable hive jar in "hive.jar.directory",
-      it will upload the hive jar to "hive.user.install.directory/user.name"
-      and use it to run queries.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.vectorized.groupby.maxentries</name>
-    <value>100000</value>
-    <description>
-      Max number of entries in the vector group by aggregation hashtables.
-      Exceeding this will trigger a flush irrelevant of memory pressure condition.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.prewarm.enabled</name>
-    <value>false</value>
-    <description>Enables container prewarm for Tez (Hadoop 2 only)</description>
-  </property>
-  <property>
-    <name>hive.prewarm.numcontainers</name>
-    <value>10</value>
-    <description>Controls the number of containers to prewarm for Tez (Hadoop 2 only)</description>
-  </property>
-
-  <property>
-    <name>hive.server2.tez.default.queues</name>
-    <value>default</value>
-    <description>
-      A list of comma separated values corresponding to YARN queues of the same name.
-      When HiveServer2 is launched in Tez mode, this configuration needs to be set
-      for multiple Tez sessions to run in parallel on the cluster.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.convert.join.bucket.mapjoin.tez</name>
-    <value>false</value>
-    <description>
-      Whether joins can be automatically converted to bucket map joins in hive
-      when tez is used as the execution engine.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.tez.auto.reducer.parallelism</name>
-    <value>false</value>
-    <description>
-      Turn on Tez' auto reducer parallelism feature. When enabled, Hive will still estimate data sizes
-      and set parallelism estimates. Tez will sample source vertices' output sizes and adjust the estimates at runtime as
-      necessary.
-    </description>
-  </property>
-  <property>
-    <name>hive.tez.max.partition.factor</name>
-    <value>2.0</value>
-    <description>When auto reducer parallelism is enabled this factor will be used to over-partition data in shuffle edges.</description>
-  </property>
-  <property>
-    <name>hive.tez.min.partition.factor</name>
-    <value>0.25</value>
-    <description>
-      When auto reducer parallelism is enabled this factor will be used to put a lower limit to the number
-      of reducers that tez specifies.
-    </description>
-  </property>
-  <property>
-    <name>hive.tez.dynamic.partition.pruning</name>
-    <value>true</value>
-    <description>When dynamic pruning is enabled, joins on partition keys will be processed by sending events from the processing vertices to the tez application master. These events will be used to prune unnecessary partitions.</description>
-  </property>
-  <property>
-    <name>hive.tez.dynamic.partition.pruning.max.event.size</name>
-    <value>1048576</value>
-    <description>Maximum size of events sent by processors in dynamic pruning. If this size is crossed no pruning will take place.</description>
-  </property>
-  <property>
-    <name>hive.tez.dynamic.partition.pruning.max.data.size</name>
-    <value>104857600</value>
-    <description>Maximum total data size of events in dynamic pruning.</description>
-  </property>
-  <property>
-    <name>hive.tez.smb.number.waves</name>
-    <value>0.5</value>
-    <description>The number of waves in which to run the SMB join. Account for cluster being occupied. Ideally should be 1 wave.</description>
-  </property>
-
-  <!-- missing from HiveConf -->
-  <property>
-    <name>hive.heapsize</name>
-    <value>1024</value>
-    <description>Hive Java heap size</description>
-  </property>
-
-  <property>
-    <name>ambari.hive.db.schema.name</name>
-    <value>hive</value>
-    <description>Database name used as the Hive Metastore</description>
-  </property>
-
-  <property>
-    <name>hive.auto.convert.sortmerge.join.noconditionaltask</name>
-    <value>true</value>
-    <description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description>
-  </property>
-
-  <property>
-    <name>hive.optimize.mapjoin.mapreduce</name>
-    <value>true</value>
-    <description>If hive.auto.convert.join is off, this parameter does not take
-      affect. If it is on, and if there are map-join jobs followed by a map-reduce
-      job (for e.g a group by), each map-only job is merged with the following
-      map-reduce job.
-    </description>
-  </property>
-
-  <!-- performance -->
-
-  <property>
-    <name>hive.vectorized.execution.enabled</name>
-    <value>true</value>
-    <description>
-      This flag should be set to true to enable vectorized mode of query execution.
-      The default value is false.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.vectorized.execution.reduce.enabled</name>
-    <value>false</value>
-    <description>
-      This flag should be set to true to enable vectorized mode of the reduce-side of query execution.
-      The default value is true.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.optimize.index.filter</name>
-    <value>true</value>
-    <description>Whether to enable automatic use of indexes</description>
-  </property>
-
-  <property>
-    <name>hive.execution.engine</name>
-    <value>mr</value>
-    <description>
-      Expects one of [mr, tez].
-      Chooses execution engine. Options are: mr (Map reduce, default) or tez (hadoop 2 only)
-    </description>
-  </property>
-
-  <property>
-    <name>hive.vectorized.groupby.checkinterval</name>
-    <value>4096</value>
-    <description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description>
-  </property>
-
-  <property>
-    <name>hive.vectorized.groupby.flush.percent</name>
-    <value>0.1</value>
-    <description>Percent of entries in the group by aggregation hash flushed when the memory threshold is exceeded.</description>
-  </property>
-
-  <property>
-    <name>hive.compute.query.using.stats</name>
-    <value>true</value>
-    <description>
-      When set to true Hive will answer a few queries like count(1) purely using stats
-      stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
-      For more advanced stats collection need to run analyze table queries.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.limit.pushdown.memory.usage</name>
-    <value>0.04</value>
-    <description>The max memory to be used for hash in RS operator for top K selection.</description>
-  </property>
-
-  <property>
-    <name>hive.server2.tez.sessions.per.default.queue</name>
-    <value>1</value>
-    <description>
-      A positive integer that determines the number of Tez sessions that should be
-      launched on each of the queues specified by "hive.server2.tez.default.queues".
-      Determines the parallelism on each queue.
-    </description>
-  </property>
-
-  <property>
-    <name>hive.server2.tez.initialize.default.sessions</name>
-    <value>false</value>
-    <description>
-      This flag is used in HiveServer2 to enable a user to use HiveServer2 without
-      turning on Tez for HiveServer2. The user could potentially want to run queries
-      over Tez without the pool of sessions.
-    </description>
-  </property>
-
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/webhcat-site.xml
deleted file mode 100644
index bc95f5b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/webhcat-site.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- The default settings for Templeton. -->
-<!-- Edit templeton-site.xml to change settings for your local -->
-<!-- install. -->
-
-<configuration supports_final="true">
-
-  <property>
-    <name>templeton.jar</name>
-    <value>/usr/hdp/current/hive-webhcat/share/webhcat/svr/lib/hive-webhcat-*.jar</value>
-    <description>The path to the Templeton jar file.</description>
-  </property>
-
-  <property>
-    <name>templeton.libjars</name>
-    <value>/usr/hdp/current/zookeeper-client/zookeeper.jar</value>
-    <description>Jars to add the the classpath.</description>
-  </property>
-
-  <property>
-    <name>templeton.hadoop</name>
-    <value>/usr/hdp/current/hadoop-client/bin/hadoop</value>
-    <description>The path to the Hadoop executable.</description>
-  </property>
-
-  <property>
-    <name>templeton.pig.archive</name>
-    <value>glusterfs:///hdp/apps/${hdp.version}/pig/pig.tar.gz</value>
-    <description>The path to the Pig archive in HDFS.</description>
-  </property>
-
-  <property>
-    <name>templeton.pig.path</name>
-    <value>pig.tar.gz/pig/bin/pig</value>
-    <description>The path to the Pig executable.</description>
-  </property>
-
-  <property>
-    <name>templeton.hcat</name>
-    <value>/usr/hdp/current/hive-client/bin/hcat</value>
-    <description>The path to the hcatalog executable.</description>
-  </property>
-
-  <property>
-    <name>templeton.hive.archive</name>
-    <value>glusterfs:///hdp/apps/${hdp.version}/hive/hive.tar.gz</value>
-    <description>The path to the Hive archive.</description>
-  </property>
-
-  <property>
-    <name>templeton.hive.home</name>
-    <value>hive.tar.gz/hive</value>
-    <description>The path to the Hive home within the tar. Has no effect if templeton.hive.archive is not set.</description>
-  </property>
-
-  <property>
-    <name>templeton.hcat.home</name>
-    <value>hive.tar.gz/hive/hcatalog</value>
-    <description>The path to the HCat home within the tar. Has no effect if templeton.hive.archive is not set.</description>
-  </property>
-
-  <property>
-    <name>templeton.hive.path</name>
-    <value>hive.tar.gz/hive/bin/hive</value>
-    <description>The path to the Hive executable.</description>
-  </property>
-
-  <property>
-    <name>templeton.sqoop.archive</name>
-    <value>glusterfs:///hdp/apps/${hdp.version}/sqoop/sqoop.tar.gz</value>
-    <description>The path to the Sqoop archive in HDFS.</description>
-  </property>
-
-  <property>
-    <name>templeton.sqoop.path</name>
-    <value>sqoop.tar.gz/sqoop/bin/sqoop</value>
-    <description>The path to the Sqoop executable.</description>
-  </property>
-
-  <property>
-    <name>templeton.sqoop.home</name>
-    <value>sqoop.tar.gz/sqoop</value>
-    <description>The path to the Sqoop home within the tar. Has no effect if
-      templeton.sqoop.archive is not set.
-    </description>
-  </property>
-
-  <property>
-    <name>templeton.streaming.jar</name>
-    <value>glusterfs:///hdp/apps/${hdp.version}/mapreduce/hadoop-streaming.jar</value>
-    <description>The glusterfs path to the Hadoop streaming jar file.</description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/metainfo.xml
deleted file mode 100644
index 0e294f0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/metainfo.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>HIVE</name>
-      <version>0.14.0.2.2.0.0</version>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>mysql-connector-java</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>hive_2_2_*</name>
-            </package>
-            <package>
-              <name>hive_2_2_*-hcatalog</name>
-            </package>
-            <package>
-              <name>hive_2_2_*-webhcat</name>
-            </package>
-            <package>
-              <name>mysql</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>hive-2-2-.*</name>
-            </package>
-            <package>
-              <name>hive-2-2-.*-hcatalog</name>
-            </package>
-            <package>
-              <name>hive-2-2-.*-webhcat</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse11</osFamily>
-          <packages>
-            <package>
-              <name>mysql-client</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-      <requiredServices>
-        <service>PIG</service>
-      </requiredServices>
-
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/alerts.json b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/alerts.json
deleted file mode 100644
index 0988ef2..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/alerts.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "KAFKA": {
-    "service": [],
-    "KAFKA_BROKER": [
-      {
-        "name": "kafka_broker_process",
-        "label": "Kafka Broker Process",
-        "interval": 1,
-        "scope": "HOST",
-        "source": {
-          "type": "PORT",
-          "uri": "{{kafka-broker/port}}",
-          "default_port": 6667,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-broker.xml
deleted file mode 100644
index dc1b6b4..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-broker.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>log.dirs</name>
-    <value>/kafka-logs</value>
-    <description>
-      A comma-separated list of one or more directories in which Kafka data is stored.
-      Each new partition that is created will be placed in the directory which currently has the fewest partitions.
-    </description>
-  </property>
-  <property>
-    <name>port</name>
-    <value>6667</value>
-    <description>
-      The port on which the server accepts client connections.
-    </description>
-  </property>
-  <property>
-    <name>zookeeper.connect</name>
-    <value>localhost:2181</value>
-    <description>
-      Zookeeper also allows you to add a "chroot" path which will make all kafka data for this cluster appear under a particular path.
-      This is a way to setup multiple Kafka clusters or other applications on the same zookeeper cluster. To do this give a connection
-      string in the form hostname1:port1,hostname2:port2,hostname3:port3/chroot/path which would put all this cluster's data under the
-      path /chroot/path. Note that you must create this path yourself prior to starting the broker and consumers must use the
-      same connection string.
-    </description>
-  </property>
-  <property>
-    <name>message.max.bytes</name>
-    <value>1000000</value>
-    <description>
-      The maximum size of a message that the server can receive.
-      It is important that this property be in sync with the maximum fetch size your consumers use or
-      else an unruly producer will be able to publish messages too large for consumers to consume.
-    </description>
-  </property>
-  <property>
-    <name>num.network.threads</name>
-    <value>3</value>
-    <description>
-      The number of network threads that the server uses for handling network requests.
-      You probably don't need to change this.
-    </description>
-  </property>
-  <property>
-    <name>num.io.threads</name>
-    <value>8</value>
-    <description>
-      The number of I/O threads that the server uses for executing requests. You should have at least as many threads as you have disks.
-    </description>
-  </property>
-  <property>
-    <name>queued.max.requests</name>
-    <value>500</value>
-    <description>The number of requests that can be queued up for processing by the I/O threads before the network threads stop reading in new requests.</description>
-  </property>
-  <property>
-    <name>socket.send.buffer.bytes</name>
-    <value>102400</value>
-    <description>
-      The SO_SNDBUFF buffer the server prefers for socket connections.
-    </description>
-  </property>
-  <property>
-    <name>socket.receive.buffer.bytes</name>
-    <value>102400</value>
-    <description>
-      The SO_RCVBUFF buffer the server prefers for socket connections.
-    </description>
-  </property>
-  <property>
-    <name>socket.request.max.bytes</name>
-    <value>104857600</value>
-    <description>
-      The maximum request size the server will allow. This prevents the server from running out of memory and should be smaller than the Java heap size.
-    </description>
-  </property>
-  <property>
-    <name>num.partitions</name>
-    <value>1</value>
-    <description>
-       	The default number of partitions per topic.
-    </description>
-  </property>
-  <property>
-    <name>log.segment.bytes</name>
-    <value>1073741824</value>
-    <description>
-      The maximum request size the server will allow.
-      This prevents the server from running out of memory and should be smaller than the Java heap size.
-    </description>
-  </property>
-  <property>
-    <name>log.roll.hours</name>
-    <value>168</value>
-    <description>
-      This setting will force Kafka to roll a new log segment even if the log.segment.bytes size has not been reached.
-    </description>
-  </property>
-  <property>
-    <name>log.retention.bytes</name>
-    <value>-1</value>
-    <description>
-      The amount of data to retain in the log for each topic-partitions. Note that this is the limit per-partition so multiply by the number of partitions to get the total data retained for the topic. Also note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
-    </description>
-  </property>
-  <property>
-    <name>log.retention.hours</name>
-    <value>168</value>
-    <description>
-      The number of hours to keep a log segment before it is deleted, i.e. the default data retention window for all topics. Note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
-    </description>
-  </property>
-  <property>
-    <name>log.cleanup.interval.mins</name>
-    <value>10</value>
-    <description>The frequency in minutes that the log cleaner checks whether any log segment is eligible for deletion to meet the retention policies.
-    </description>
-  </property>
-  <property>
-    <name>log.index.size.max.bytes</name>
-    <value>10485760</value>
-    <description>
-      The maximum size in bytes we allow for the offset index for each log segment. Note that we will always pre-allocate a
-      sparse file with this much space and shrink it down when the log rolls. If the index fills up we will roll a new log segment
-      even if we haven't reached the log.segment.bytes limit.
-    </description>
-  </property>
-  <property>
-    <name>log.index.interval.bytes</name>
-    <value>4096</value>
-    <description>
-      The byte interval at which we add an entry to the offset index. When executing a fetch request the server must do a linear scan for up to this many bytes to find the correct position in the log to begin and end the fetch. So setting this value to be larger will mean larger index files (and a bit more memory usage) but less scanning. However the server will never add more than one index entry per log append (even if more than log.index.interval worth of messages are appended). In general you probably don't need to mess with this value.
-    </description>
-  </property>
-  <property>
-    <name>log.flush.interval.messages</name>
-    <value>10000</value>
-    <description>The number of messages written to a log partition before we force an fsync on the log. Setting this higher will improve performance a lot but will increase the window of data at risk in the event of a crash (though that is usually best addressed through replication). If both this setting and log.flush.interval.ms are both used the log will be flushed when either criteria is met.
-    </description>
-  </property>
-  <property>
-    <name>log.flush.scheduler.interval.ms</name>
-    <value>3000</value>
-    <description>
-      The frequency in ms that the log flusher checks whether any log is eligible to be flushed to disk.
-    </description>
-  </property>
-  <property>
-    <name>log.flush.interval.ms</name>
-    <value>3000</value>
-    <description>
-      The maximum time between fsync calls on the log. If used in conjuction with log.flush.interval.messages the log will be flushed when either criteria is met.
-    </description>
-  </property>
-  <property>
-    <name>auto.create.topics.enable</name>
-    <value>true</value>
-    <description>
-      Enable auto creation of topic on the server. If this is set to true then attempts to produce, consume, or fetch metadata for a non-existent topic will automatically create it with the default replication factor and number of partitions.
-    </description>
-  </property>
-  <property>
-    <name>controller.socket.timeout.ms</name>
-    <value>30000</value>
-    <property>The socket timeout for commands from the partition management controller to the replicas.</property>
-  </property>
-  <property>
-    <name>controller.message.queue.size</name>
-    <value>10</value>
-    <description>The buffer size for controller-to-broker-channels</description>
-  </property>
-  <property>
-    <name>default.replication.factor</name>
-    <value>1</value>
-    <description>The default replication factor for automatically created topics.</description>
-  </property>
-  <property>
-    <name>replica.lag.time.max.ms</name>
-    <value>10000</value>
-    <description>If a follower hasn't sent any fetch requests for this window of time, the leader will remove the follower from ISR (in-sync replicas) and treat it as dead.</description>
-  </property>
-  <property>
-    <name>replica.lag.max.messages</name>
-    <value>4000</value>
-    <description>
-      If a replica falls more than this many messages behind the leader, the leader will remove the follower from ISR and treat it as dead.
-    </description>
-  </property>
-  <property>
-    <name>replica.socket.timeout.ms</name>
-    <value>30000</value>
-    <description>The socket timeout for network requests to the leader for replicating data.</description>
-  </property>
-  <property>
-    <name>replica.socket.receive.buffer.bytes</name>
-    <value>65536</value>
-    <description>The socket receive buffer for network requests to the leader for replicating data.</description>
-  </property>
-  <property>
-    <name>replica.fetch.max.bytes</name>
-    <value>1048576</value>
-    <description>The number of byes of messages to attempt to fetch for each partition in the fetch requests the replicas send to the leader.</description>
-  </property>
-  <property>
-    <name>replica.fetch.wait.max.ms</name>
-    <value>500</value>
-    <description>The maximum amount of time to wait time for data to arrive on the leader in the fetch requests sent by the replicas to the leader.</description>
-  </property>
-  <property>
-    <name>replica.fetch.min.bytes</name>
-    <value>1</value>
-    <description>Minimum bytes expected for each fetch response for the fetch requests from the replica to the leader. If not enough bytes, wait up to replica.fetch.wait.max.ms for this many bytes to arrive.
-    </description>
-  </property>
-  <property>
-    <name>num.replica.fetchers</name>
-    <value>1</value>
-    <description>
-      Number of threads used to replicate messages from leaders. Increasing this value can increase the degree of I/O parallelism in the follower broker.
-    </description>
-  </property>
-  <property>
-    <name>replica.high.watermark.checkpoint.interval.ms</name>
-    <value>5000</value>
-    <description>The frequency with which each replica saves its high watermark to disk to handle recovery.</description>
-  </property>
-  <property>
-    <name>fetch.purgatory.purge.interval.requests</name>
-    <value>10000</value>
-    <description>The purge interval (in number of requests) of the fetch request purgatory.</description>
-  </property>
-  <property>
-    <name>producer.purgatory.purge.interval.requests</name>
-    <value>10000</value>
-    <description>The purge interval (in number of requests) of the producer request purgatory.</description>
-  </property>
-  <property>
-    <name>zookeeper.session.timeout.ms</name>
-    <value>6000</value>
-    <description>Zookeeper session timeout. If the server fails to heartbeat to zookeeper within this period of time it is considered dead. If you set this too low the server may be falsely considered dead; if you set it too high it may take too long to recognize a truly dead server.</description>
-  </property>
-  <property>
-    <name>zookeeper.connection.timeout.ms</name>
-    <value>6000</value>
-    <description>The maximum amount of time that the client waits to establish a connection to zookeeper.</description>
-  </property>
-  <property>
-    <name>zookeeper.sync.time.ms</name>
-    <value>2000</value>
-    <description>How far a ZK follower can be behind a ZK leader.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.enable</name>
-    <value>false</value>
-    <description>Enable controlled shutdown of the broker. If enabled, the broker will move all leaders on it to some other brokers before shutting itself down. This reduces the unavailability window during shutdown.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.max.retries</name>
-    <value>3</value>
-    <description>Number of retries to complete the controlled shutdown successfully before executing an unclean shutdown.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.retry.backoff.ms</name>
-    <value>5000</value>
-    <description>
-      Backoff time between shutdown retries.
-    </description>
-  </property>
-  <property>
-    <name>kafka.metrics.reporters</name>
-    <value>kafka.ganglia.KafkaGangliaMetricsReporter</value>
-    <description>
-      kafka ganglia metrics reporter
-    </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.reporter.enabled</name>
-    <value>true</value>
-    <description>
-      kafka ganglia metrics reporter enable
-    </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.host</name>
-    <value>localhost</value>
-    <description> Ganglia host </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.port</name>
-    <value>8671</value>
-    <description> Ganglia port </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.group</name>
-    <value>kafka</value>
-    <description>Ganglia group name </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-env.xml
deleted file mode 100644
index 7ad4396..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-env.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>kafka_user</name>
-    <value>kafka</value>
-    <property-type>USER</property-type>
-    <description></description>
-  </property>
-  <property>
-    <name>kafka_log_dir</name>
-    <value>/var/log/kafka</value>
-    <description></description>
-  </property>
-  <property>
-    <name>kafka_pid_dir</name>
-    <value>/var/run/kafka</value>
-    <description></description>
-  </property>
-
-  <!-- kafka-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for kafka-env.sh file</description>
-    <value>
-#!/bin/bash
-
-# Set KAFKA specific environment variables here.
-
-# The java implementation to use.
-export JAVA_HOME={{java64_home}}
-export PATH=$PATH:$JAVA_HOME/bin
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-log4j.xml
deleted file mode 100644
index 901859e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/configuration/kafka-log4j.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-#
-kafka.logs.dir=logs
-
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.kafkaAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.kafkaAppender.File=${kafka.logs.dir}/server.log
-log4j.appender.kafkaAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.kafkaAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.stateChangeAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.stateChangeAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.stateChangeAppender.File=${kafka.logs.dir}/state-change.log
-log4j.appender.stateChangeAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.stateChangeAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.requestAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.requestAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.requestAppender.File=${kafka.logs.dir}/kafka-request.log
-log4j.appender.requestAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.requestAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.cleanerAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.cleanerAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.cleanerAppender.File=${kafka.logs.dir}/log-cleaner.log
-log4j.appender.cleanerAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.cleanerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.controllerAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.controllerAppender.File=${kafka.logs.dir}/controller.log
-log4j.appender.controllerAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.controllerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-# Turn on all our debugging info
-#log4j.logger.kafka.producer.async.DefaultEventHandler=DEBUG, kafkaAppender
-#log4j.logger.kafka.client.ClientUtils=DEBUG, kafkaAppender
-#log4j.logger.kafka.perf=DEBUG, kafkaAppender
-#log4j.logger.kafka.perf.ProducerPerformance$ProducerThread=DEBUG, kafkaAppender
-#log4j.logger.org.I0Itec.zkclient.ZkClient=DEBUG
-log4j.logger.kafka=INFO, kafkaAppender
-log4j.logger.kafka.network.RequestChannel$=WARN, requestAppender
-log4j.additivity.kafka.network.RequestChannel$=false
-
-#log4j.logger.kafka.network.Processor=TRACE, requestAppender
-#log4j.logger.kafka.server.KafkaApis=TRACE, requestAppender
-#log4j.additivity.kafka.server.KafkaApis=false
-log4j.logger.kafka.request.logger=WARN, requestAppender
-log4j.additivity.kafka.request.logger=false
-
-log4j.logger.kafka.controller=TRACE, controllerAppender
-log4j.additivity.kafka.controller=false
-
-log4j.logger.kafka.log.LogCleaner=INFO, cleanerAppender
-log4j.additivity.kafka.log.LogCleaner=false
-
-log4j.logger.state.change.logger=TRACE, stateChangeAppender
-log4j.additivity.state.change.logger=false
-
-   </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metainfo.xml
deleted file mode 100644
index f410d98..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metainfo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>KAFKA</name>
-      <displayName>Kafka</displayName>
-      <comment>A high-throughput distributed messaging system</comment>
-      <version>0.8.1.2.2.0.0</version>
-      <components>
-        <component>
-          <name>KAFKA_BROKER</name>
-          <displayName>Kafka Broker</displayName>
-          <category>MASTER</category>
-          <cardinality>1+</cardinality>
-          <dependencies>
-            <dependency>
-              <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
-              <scope>cluster</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-          </dependencies>
-          <commandScript>
-            <script>scripts/kafka_broker.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>kafka_2_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>kafka-2-2-.*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-      <requiredServices>
-        <service>ZOOKEEPER</service>
-      </requiredServices>
-      <configuration-dependencies>
-        <config-type>kafka-broker</config-type>
-        <config-type>kafka-env</config-type>
-        <config-type>kafka-log4j</config-type>
-      </configuration-dependencies>
-      <restartRequiredAfterChange>true</restartRequiredAfterChange>
-    </service>
-  </services>
-</metainfo>


[5/7] ambari git commit: AMBARI-10446 Remove 2.2.GlusterFS stack

Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metrics.json
deleted file mode 100644
index 58e4ecb..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/metrics.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "KAFKA_BROKER": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/jvm/uptime": {
-              "metric": "jvm.uptime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/heap_usage": {
-              "metric": "jvm.heap_usage",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/non_heap_usage": {
-              "metric": "jvm.non_heap_usage",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/runnable": {
-              "metric": "jvm.thread-states.runnable",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/blocked": {
-              "metric": "jvm.thread-states.blocked",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/timed_waiting": {
-              "metric": "jvm.thread-states.timed_waiting",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/terminated": {
-              "metric": "jvm.thread-states.terminated",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread_count": {
-              "metric": "jvm.thread_count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/daemon_thread_count": {
-              "metric": "jvm.daemon_thread_count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.5MinuteRate",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.15MinuteRate",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics/AllTopicsMessagesInPerSec/meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics/AllTopicsMessagesInPerSec.counte",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/KafkaController/ActiveControllerCount": {
-              "metric": "kafka.controller.KafkaController.ActiveControllerCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/meanRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/1MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/5MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/15MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/count": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/meanRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/1MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/5MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/15MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/count": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/1MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/5MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/15MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/OfflinePartitionsCount": {
-              "metric": "kafka.controller.ControllerStats.OfflinePartitionsCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/PartitionCount": {
-              "metric": "kafka.server.ReplicaManager.PartitionCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/LeaderCount": {
-              "metric": "kafka.server.ReplicaManager.LeaderCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/UnderReplicatedPartitions": {
-              "metric": "kafka.server.ReplicaManager.UnderReplicatedPartitions",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/ISRShrinksPerSec": {
-              "metric": "kafka.server.ReplicaManager.ISRShrinksPerSec",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/ISRExpandsPerSec": {
-              "metric": "kafka.server.ReplicaManager.ISRExpandsPerSec",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/kafka/server/ReplicaFetcherManager/Replica-MaxLag": {
-              "metric": "kafka.server.ReplicaFetcherManager.Replica-MaxLag",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ProducerRequestPurgatory/PurgatorySize": {
-              "metric": "kafka.server.ProducerRequestPurgatory.PurgatorySize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/FetchRequestPurgatory/PurgatorySize": {
-              "metric": "kafka.server.FetchRequestPurgatory.PurgatorySize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/cluster/Partition/$1-UnderReplicated": {
-              "metric": "kafka.cluster.Partition.(\\w+)-UnderReplicated",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/consumer/ConsumerFetcherManager/$1-MaxLag": {
-              "metric": "kafka.consumer.ConsumerFetcherManager.(\\w+)-MaxLag",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/consumer/ConsumerFetcherManager/$1-MinFetch": {
-              "metric": "kafka.consumer.ConsumerFetcherManager.(\\w+)-MinFetch",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka.py
deleted file mode 100644
index c0231a8..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-from properties_config import properties_config
-import sys
-from copy import deepcopy
-
-def kafka():
-    import params
-
-    Directory([params.log_dir, params.pid_dir, params.conf_dir],
-              owner=params.kafka_user,
-              group=params.user_group,
-              recursive=True
-          )
-    brokerid = str(sorted(params.kafka_hosts).index(params.hostname))
-    kafka_server_config = mutable_config_dict(params.config['configurations']['kafka-broker'])
-    kafka_server_config['broker.id'] = brokerid
-    kafka_server_config['host.name'] = params.hostname
-    kafka_data_dir = kafka_server_config['log.dirs']
-    Directory(filter(None,kafka_data_dir.split(",")),
-              owner=params.kafka_user,
-              group=params.user_group,
-              recursive=True)
-
-    conf_dir = params.conf_dir
-    properties_config("server.properties",
-                      conf_dir=params.conf_dir,
-                      configurations=kafka_server_config,
-                      owner=params.kafka_user,
-                      group=params.user_group,
-                      brokerid=brokerid)
-
-    File(format("{conf_dir}/kafka-env.sh"),
-          owner=params.kafka_user,
-          content=InlineTemplate(params.kafka_env_sh_template)
-     )
-
-    if (params.log4j_props != None):
-        File(format("{conf_dir}/log4j.properties"),
-             mode=0644,
-             group=params.user_group,
-             owner=params.kafka_user,
-             content=params.log4j_props
-         )
-
-
-def mutable_config_dict(kafka_broker_config):
-    kafka_server_config = {}
-    for key, value in kafka_broker_config.iteritems():
-        kafka_server_config[key] = value
-    return kafka_server_config

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka_broker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka_broker.py
deleted file mode 100644
index c79ebb9..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/kafka_broker.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-import sys
-
-from kafka import kafka
-
-class KafkaBroker(Script):
-  def install(self, env):
-    self.install_packages(env)
-    self.configure(env)
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    kafka()
-
-  def start(self, env):
-    import params
-    env.set_params(params)
-    self.configure(env)
-    daemon_cmd = format('source {params.conf_dir}/kafka-env.sh ; {params.kafka_bin} start')
-    no_op_test = format('ls {params.pid_file} >/dev/null 2>&1 && ps -p `cat {params.pid_file}` >/dev/null 2>&1')
-    Execute(daemon_cmd,
-            user=params.kafka_user,
-            not_if=no_op_test
-    )
-
-  def stop(self, env):
-    import params
-    env.set_params(params)
-    self.configure(env)
-    daemon_cmd = format('source {params.conf_dir}/kafka-env.sh; {params.kafka_bin} stop')
-    Execute(daemon_cmd,
-            user=params.kafka_user,
-    )
-    Execute (format("rm -f {params.pid_file}"))
-
-
-  def status(self, env):
-    import status_params
-    env.set_params(status_params)
-    check_process_status(status_params.kafka_pid_file)
-
-if __name__ == "__main__":
-  KafkaBroker().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py
deleted file mode 100644
index 0dd306a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions
-from resource_management import *
-import status_params
-
-# server configurations
-config = Script.get_config()
-
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
-stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0
-
-if stack_is_hdp22_or_further:
-    kafka_home = '/usr/hdp/current/kafka-broker/'
-    kafka_bin = kafka_home+'bin/kafka'
-else:
-    kafka_home = '/usr/lib/kafka/'
-    kafka_bin = kafka_home+'/bin/kafka'
-
-
-conf_dir = "/etc/kafka/conf"
-kafka_user = config['configurations']['kafka-env']['kafka_user']
-log_dir = config['configurations']['kafka-env']['kafka_log_dir']
-pid_dir = status_params.kafka_pid_dir
-pid_file = pid_dir+"/kafka.pid"
-hostname = config['hostname']
-user_group = config['configurations']['cluster-env']['user_group']
-java64_home = config['hostLevelParams']['java_home']
-kafka_env_sh_template = config['configurations']['kafka-env']['content']
-kafka_hosts = config['clusterHostInfo']['kafka_broker_hosts']
-kafka_hosts.sort()
-
-zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
-zookeeper_hosts.sort()
-
-if (('kafka-log4j' in config['configurations']) and ('content' in config['configurations']['kafka-log4j'])):
-    log4j_props = config['configurations']['kafka-log4j']['content']
-else:
-    log4j_props = None

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/properties_config.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/properties_config.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/properties_config.py
deleted file mode 100644
index 56bab2c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/properties_config.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-import re
-from resource_management import *
-
-def properties_inline_template(configurations):
-  return source.InlineTemplate('''{% for key, value in configurations_dict.items() %}{{ key }}={{ value }}
-{% endfor %}''', configurations_dict=configurations)
-
-def properties_config(filename, configurations = None, conf_dir = None,
-                      mode = None, owner = None, group = None, brokerid = None):
-    config_content = properties_inline_template(configurations)
-    File (format("{conf_dir}/{filename}"), content = config_content, owner = owner,
-          group = group, mode = mode)

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/service_check.py
deleted file mode 100644
index c2b4bc1..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/service_check.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-from __future__ import print_function
-from resource_management import *
-import  sys,subprocess,os
-
-class ServiceCheck(Script):
-    def service_check(self, env):
-        import params
-        env.set_params(params)
-        kafka_config=self.read_kafka_config(params.conf_dir)
-        self.set_env(params.conf_dir)
-        create_topic_cmd_created_output = "Created topic \"ambari_kafka_service_check\"."
-        create_topic_cmd_exists_output = "Topic \"ambari_kafka_service_check\" already exists."
-	print("Running kafka create topic command", file=sys.stdout)
-        create_topic_cmd = [params.kafka_home+'/bin/kafka-topics.sh', '--zookeeper '+kafka_config['zookeeper.connect'],
-                            '--create --topic ambari_kafka_service_check', '--partitions 1 --replication-factor 1']
-	print(" ".join(create_topic_cmd), file=sys.stdout)
-        create_topic_process = subprocess.Popen(create_topic_cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        out, err = create_topic_process.communicate()
-        if out.find(create_topic_cmd_created_output) != -1:
-	    print(out, file=sys.stdout)
-            sys.exit(0)
-        elif out.find(create_topic_cmd_exists_output) != -1:
-            print("Topic ambari_kafka_service_check exists", file=sys.stdout)
-            sys.exit(0)
-        else:
-	    print(out, file=sys.stderr)
-            sys.exit(1)
-
-    def read_kafka_config(self,kafka_conf_dir):
-        conf_file = open(kafka_conf_dir+"/server.properties","r")
-        kafka_config = {}
-        for line in conf_file:
-            key,value = line.split("=")
-            kafka_config[key] = value.replace("\n","")
-        return kafka_config
-
-    def set_env(self, kafka_conf_dir):
-        command = ['bash', '-c', 'source '+kafka_conf_dir+'/kafka-env.sh && env']
-        proc = subprocess.Popen(command, stdout = subprocess.PIPE)
-        for line in proc.stdout:
-            (key, _, value) = line.partition("=")
-            os.environ[key] = value.replace("\n","")
-        proc.communicate()
-
-if __name__ == "__main__":
-    ServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/status_params.py
deleted file mode 100644
index fcb0816..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/status_params.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-config = Script.get_config()
-
-kafka_pid_dir = config['configurations']['kafka-env']['kafka_pid_dir']
-kafka_pid_file = format("{kafka_pid_dir}/kafka.pid")

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kadm5-acl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kadm5-acl.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kadm5-acl.xml
deleted file mode 100644
index 31aa72c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kadm5-acl.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<configuration>
-  <property>
-    <name>conf_dir</name>
-    <description>The kadm.acl configuration directory</description>
-    <value>/var/kerberos/krb5kdc</value>
-  </property>
-  <property>
-    <name>content</name>
-    <description>The jinja template for the kadm5.acl file</description>
-    <value>
-      */admin@{{realm}}	*
-
-      {# Append additional realm declarations below #}
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kdc-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kdc-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kdc-conf.xml
deleted file mode 100644
index 9b0199e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kdc-conf.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>kdcdefaults_kdc_ports</name>
-    <value>88</value>
-  </property>
-  <property>
-    <name>kdcdefaults_kdc_tcp_ports</name>
-    <value>88</value>
-  </property>
-
-  <property>
-    <name>conf_dir</name>
-    <description>The kdc.conf configuration directory</description>
-    <value>/var/kerberos/krb5kdc</value>
-  </property>
-  <property>
-    <name>content</name>
-    <description>The jinja template for the kdc.conf file</description>
-    <value>
-      [kdcdefaults]
-        kdc_ports = {{kdcdefaults_kdc_ports}}
-        kdc_tcp_ports = {{kdcdefaults_kdc_tcp_ports}}
-
-      [realms]
-        {{realm}} = {
-          acl_file = {{kadm5_acl_path}}
-          dict_file = /usr/share/dict/words
-          admin_keytab = {{kadm5_acl_dir}}/kadm5.keytab
-          supported_enctypes = {{encryption_types}}
-      }
-
-      {# Append additional realm declarations below #}
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kerberos-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kerberos-env.xml
deleted file mode 100644
index 6e698cf..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/kerberos-env.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-  <property require-input="true">
-    <name>kdc_type</name>
-    <description>
-      The type of KDC being used. Either mit-kdc or active-directory
-    </description>
-    <value>mit-kdc</value>
-  </property>
-
-  <property require-input="true">
-    <name>ldap_url</name>
-    <description>
-      The URL to the Active Directory LDAP Interface
-    </description>
-    <value/>
-  </property>
-
-  <property require-input="true">
-    <name>container_dn</name>
-    <description>
-      The distinguished name (DN) of the container used store service principals
-    </description>
-    <value/>
-  </property>
-
-  <property require-input="true">
-    <name>encryption_types</name>
-    <description>
-      The supported list of session key encryption types that should be returned by the KDC.
-    </description>
-    <value>aes des3-cbc-sha1 rc4 des-cbc-md5</value>
-  </property>
-
-  <property require-input="true">
-    <name>realm</name>
-    <description>
-      The default realm to use when creating service principals
-    </description>
-    <value/>
-  </property>
-
-  <property require-input="true">
-    <name>kdc_host</name>
-    <description>
-      The IP address or FQDN for the KDC host. Optionally a port number may be included.
-    </description>
-    <value/>
-  </property>
-
-  <property>
-    <name>admin_server_host</name>
-    <description>
-      The IP address or FQDN for the KDC Kerberos administrative host. Optionally a port number may be included.
-    </description>
-    <value/>
-  </property>
-
-  <property>
-    <name>service_check_principal_name</name>
-    <description>
-      The principal name to use when executing the Kerberos service check
-    </description>
-    <value>${cluster_name}-${short_date}</value>
-  </property>
-
-  <property require-input="true">
-    <name>create_attributes_template</name>
-    <description>
-      A Velocity template to use to generate a JSON-formatted document containing the set of
-      attribute names and values needed to create a new Kerberos identity in the relevant KDC.
-      Variables include:
-      principal_name, principal_primary, principal_instance, realm, realm_lowercase,
-      normalized_principal, principal digest, password, is_service, container_dn
-    </description>
-    <value>
-{
-  "objectClass": ["top", "person", "organizationalPerson", "user"],
-  "cn": "$principal_name",
-  #if( $is_service )
-  "servicePrincipalName": "$principal_name",
-  #end
-  "userPrincipalName": "$normalized_principal",
-  "unicodePwd": "$password",
-  "accountExpires": "0",
-  "userAccountControl": "66048"
-}
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/krb5-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/krb5-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/krb5-conf.xml
deleted file mode 100644
index 8622e13..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/configuration/krb5-conf.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property require-input="false">
-    <name>domains</name>
-    <description>
-      A comma-delimited list of domain names that the realm serves (optional)
-    </description>
-    <value/>
-  </property>
-  <property>
-    <name>test_principal</name>
-    <description>
-      The principal that may be used to test the Kerberos configuration (this will not be retained)
-    </description>
-    <value/>
-  </property>
-  <property>
-    <name>test_password</name>
-    <description>
-      The password for the administrative principal (either this value or the keytab value is
-      required to be set, neither is expected to be retained)
-    </description>
-    <value/>
-    <property-type>PASSWORD</property-type>
-  </property>
-  <property>
-    <name>test_keytab</name>
-    <description>
-      The base64-encoded keytab for the test principal (either this value or the password
-      value is required to be set, neither is expected to be retained)
-    </description>
-    <value>
-
-    </value>
-  </property>
-
-  <property>
-    <name>manage_krb5_conf</name>
-    <description>
-      Indicates weather the Kerberos client krb5.conf file should be managed by Ambari or you will manage manually
-    </description>
-    <value>true</value>
-  </property>
-
-  <property>
-    <name>conf_dir</name>
-    <description>The krb5.conf configuration directory</description>
-    <value>/etc</value>
-  </property>
-  <property>
-    <name>content</name>
-    <description>The jinja template for the krb5.conf file</description>
-    <value>
-[libdefaults]
-  renew_lifetime = 7d
-  forwardable = true
-  default_realm = {{realm|upper()}}
-  ticket_lifetime = 24h
-  dns_lookup_realm = false
-  dns_lookup_kdc = false
-  #default_tgs_enctypes = {{encryption_types}}
-  #default_tkt_enctypes = {{encryption_types}}
-
-{% if domains %}
-[domain_realm]
-{% for domain in domains.split(',') %}
-  {{domain}} = {{realm|upper()}}
-{% endfor %}
-{% endif %}
-
-[logging]
-  default = FILE:/var/log/krb5kdc.log
-  admin_server = FILE:/var/log/kadmind.log
-  kdc = FILE:/var/log/krb5kdc.log
-
-[realms]
-  {{realm}} = {
-    admin_server = {{admin_server_host|default(kdc_host, True)}}
-    kdc = {{kdc_host}}
-  }
-
-{# Append additional realm declarations below #}
-    </value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/metainfo.xml
deleted file mode 100644
index 894033b..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/metainfo.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>KERBEROS</name>
-      <displayName>Kerberos</displayName>
-      <comment>A computer network authentication protocol which works on
-        the basis of 'tickets' to allow nodes communicating over a
-        non-secure network to prove their identity to one another in a
-        secure manner.
-      </comment>
-      <version>1.10.3-10</version>
-
-      <components>
-        <component>
-          <name>KDC_SERVER</name>
-          <displayName>Kerberos KDC</displayName>
-          <category>MASTER</category>
-          <cardinality>0-1</cardinality>
-          <dependencies>
-            <dependency>
-              <name>KERBEROS/KERBEROS_CLIENT</name>
-              <scope>cluster</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-          </dependencies>
-          <commandScript>
-            <script>scripts/kerberos_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>900</timeout>
-          </commandScript>
-          <configFiles>
-            <configFile>
-              <type>env</type>
-              <fileName>krb5.conf</fileName>
-              <dictionaryName>krb5-conf</dictionaryName>
-            </configFile>
-            <configFile>
-              <type>env</type>
-              <fileName>kdc.conf</fileName>
-              <dictionaryName>kdc-conf</dictionaryName>
-            </configFile>
-            <configFile>
-              <type>env</type>
-              <fileName>kadm5.acl</fileName>
-              <dictionaryName>kadm5-acl</dictionaryName>
-            </configFile>
-          </configFiles>
-        </component>
-
-        <component>
-          <name>KERBEROS_CLIENT</name>
-          <displayName>Kerberos Client</displayName>
-          <category>CLIENT</category>
-          <cardinality>ALL</cardinality>
-          <auto-deploy>
-            <enabled>true</enabled>
-          </auto-deploy>
-          <commandScript>
-            <script>scripts/kerberos_client.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-          <customCommands>
-            <customCommand>
-              <name>SET_KEYTAB</name>
-              <commandScript>
-                <script>scripts/kerberos_client.py</script>
-                <scriptType>PYTHON</scriptType>
-                <timeout>1000</timeout>
-              </commandScript>
-            </customCommand>
-            <customCommand>
-              <name>REMOVE_KEYTAB</name>
-              <commandScript>
-                <script>scripts/kerberos_client.py</script>
-                <scriptType>PYTHON</scriptType>
-                <timeout>1000</timeout>
-              </commandScript>
-            </customCommand>
-          </customCommands>
-          <configFiles>
-            <configFile>
-              <type>env</type>
-              <fileName>krb5.conf</fileName>
-              <dictionaryName>krb5-conf</dictionaryName>
-            </configFile>
-          </configFiles>
-        </component>
-      </components>
-
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat5,redhat6</osFamily>
-          <packages>
-            <package>
-              <name>krb5-server</name>
-            </package>
-            <package>
-              <name>krb5-libs</name>
-            </package>
-            <package>
-              <name>krb5-workstation</name>
-            </package>
-          </packages>
-        </osSpecific>
-
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>krb5-kdc</name>
-            </package>
-            <package>
-              <name>krb5-admin-server</name>
-            </package>
-            <package>
-              <name>krb5-user</name>
-            </package>
-            <package>
-              <name>krb5-config</name>
-            </package>
-          </packages>
-        </osSpecific>
-
-        <osSpecific>
-          <osFamily>suse11</osFamily>
-          <packages>
-            <package>
-              <name>krb5</name>
-            </package>
-            <package>
-              <name>krb5-client</name>
-            </package>
-            <package>
-              <name>krb5-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-
-      <configuration-dependencies>
-        <config-type>krb5-conf</config-type>
-        <config-type>kdc-conf</config-type>
-        <config-type>kadm5-acl</config-type>
-      </configuration-dependencies>
-      <restartRequiredAfterChange>true</restartRequiredAfterChange>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_client.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_client.py
deleted file mode 100644
index 380c094..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_client.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from kerberos_common import *
-
-class KerberosClient(KerberosScript):
-  def install(self, env):
-    self.install_packages(env, ['krb5-server', 'krb5-libs', 'krb5-auth-dialog', 'krb5', 'krb5-kdc', 'krb5-admin-server'])
-    self.configure(env)
-
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    if params.manage_krb5_conf:
-      self.write_krb5_conf()
-
-  def status(self, env):
-    raise ClientComponentHasNoStatus()
-
-  def set_keytab(self, env):
-    KerberosScript.write_keytab_file()
-
-  def remove_keytab(self, env):
-    self.delete_keytab_file()
-
-if __name__ == "__main__":
-  KerberosClient().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_common.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_common.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_common.py
deleted file mode 100644
index cb414c7..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_common.py
+++ /dev/null
@@ -1,419 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-import base64
-import os
-import string
-import subprocess
-import sys
-import tempfile
-
-from resource_management import *
-from utils import get_property_value
-from ambari_commons.os_utils import remove_file
-
-class KerberosScript(Script):
-  KRB5_REALM_PROPERTIES = [
-    'kdc',
-    'admin_server',
-    'default_domain',
-    'master_kdc'
-  ]
-
-  KRB5_SECTION_NAMES = [
-    'libdefaults',
-    'logging',
-    'realms',
-    'domain_realm',
-    'capaths',
-    'ca_paths',
-    'appdefaults',
-    'plugins'
-  ]
-
-  @staticmethod
-  def create_random_password():
-    import random
-
-    chars = string.digits + string.ascii_letters
-    return ''.join(random.choice(chars) for x in range(13))
-
-  @staticmethod
-  def write_conf_section(output_file, section_name, section_data):
-    if section_name is not None:
-      output_file.write('[%s]\n' % section_name)
-
-      if section_data is not None:
-        for key, value in section_data.iteritems():
-          output_file.write(" %s = %s\n" % (key, value))
-
-
-  @staticmethod
-  def _write_conf_realm(output_file, realm_name, realm_data):
-    """ Writes out realm details
-
-    Example:
-
-     EXAMPLE.COM = {
-      kdc = kerberos.example.com
-      admin_server = kerberos.example.com
-     }
-
-    """
-    if realm_name is not None:
-      output_file.write(" %s = {\n" % realm_name)
-
-      if realm_data is not None:
-        for key, value in realm_data.iteritems():
-          if key in KerberosScript.KRB5_REALM_PROPERTIES:
-            output_file.write("  %s = %s\n" % (key, value))
-
-      output_file.write(" }\n")
-
-  @staticmethod
-  def write_conf_realms_section(output_file, section_name, realms_data):
-    if section_name is not None:
-      output_file.write('[%s]\n' % section_name)
-
-      if realms_data is not None:
-        for realm, realm_data in realms_data.iteritems():
-          KerberosScript._write_conf_realm(output_file, realm, realm_data)
-          output_file.write('\n')
-
-  @staticmethod
-  def write_krb5_conf():
-    import params
-
-    Directory(params.krb5_conf_dir,
-              owner='root',
-              recursive=True,
-              group='root',
-              mode=0755
-    )
-
-    if (params.krb5_conf_template is None) or not params.krb5_conf_template.strip():
-      content = Template('krb5_conf.j2')
-    else:
-      content = InlineTemplate(params.krb5_conf_template)
-
-    File(params.krb5_conf_path,
-         content=content,
-         owner='root',
-         group='root',
-         mode=0644
-    )
-
-  @staticmethod
-  def invoke_kadmin(query, admin_identity=None, default_realm=None):
-    """
-    Executes the kadmin or kadmin.local command (depending on whether auth_identity is set or not
-    and returns command result code and standard out data.
-
-    :param query: the kadmin query to execute
-    :param admin_identity: the identity for the administrative user (optional)
-    :param default_realm: the default realm to assume
-    :return: return_code, out
-    """
-    if (query is not None) and (len(query) > 0):
-      auth_principal = None
-      auth_keytab_file = None
-
-      if admin_identity is not None:
-        auth_principal = get_property_value(admin_identity, 'principal')
-
-      if auth_principal is None:
-        kadmin = 'kadmin.local'
-        credential = ''
-      else:
-        kadmin = 'kadmin -p "%s"' % auth_principal
-
-        auth_password = get_property_value(admin_identity, 'password')
-
-        if auth_password is None:
-          auth_keytab = get_property_value(admin_identity, 'keytab')
-
-          if auth_keytab is not None:
-            (fd, auth_keytab_file) = tempfile.mkstemp()
-            os.write(fd, base64.b64decode(auth_keytab))
-            os.close(fd)
-
-          credential = '-k -t %s' % auth_keytab_file
-        else:
-          credential = '-w "%s"' % auth_password
-
-      if (default_realm is not None) and (len(default_realm) > 0):
-        realm = '-r %s' % default_realm
-      else:
-        realm = ''
-
-      try:
-        command = '%s %s %s -q "%s"' % (kadmin, credential, realm, query.replace('"', '\\"'))
-        return shell.checked_call(command)
-      except:
-        raise
-      finally:
-        if auth_keytab_file is not None:
-          os.remove(auth_keytab_file)
-
-  @staticmethod
-  def create_keytab_file(principal, path, auth_identity=None):
-    success = False
-
-    if (principal is not None) and (len(principal) > 0):
-      if (auth_identity is None) or (len(auth_identity) == 0):
-        norandkey = '-norandkey'
-      else:
-        norandkey = ''
-
-      if (path is not None) and (len(path) > 0):
-        keytab_file = '-k %s' % path
-      else:
-        keytab_file = ''
-
-      try:
-        result_code, output = KerberosScript.invoke_kadmin(
-          'ktadd %s %s %s' % (keytab_file, norandkey, principal),
-          auth_identity)
-
-        success = (result_code == 0)
-      except:
-        raise Fail("Failed to create keytab for principal: %s (in %s)" % (principal, path))
-
-    return success
-
-  @staticmethod
-  def create_keytab(principal, auth_identity=None):
-    keytab = None
-
-    (fd, temp_path) = tempfile.mkstemp()
-    os.remove(temp_path)
-
-    try:
-      if KerberosScript.create_keytab_file(principal, temp_path, auth_identity):
-        with open(temp_path, 'r') as f:
-          keytab = base64.b64encode(f.read())
-    finally:
-      if os.path.isfile(temp_path):
-        os.remove(temp_path)
-
-    return keytab
-
-  @staticmethod
-  def principal_exists(identity, auth_identity=None):
-    exists = False
-
-    if identity is not None:
-      principal = get_property_value(identity, 'principal')
-
-      if (principal is not None) and (len(principal) > 0):
-        try:
-          result_code, output = KerberosScript.invoke_kadmin('getprinc %s' % principal,
-                                                             auth_identity)
-          exists = (output is not None) and (("Principal: %s" % principal) in output)
-        except:
-          raise Fail("Failed to determine if principal exists: %s" % principal)
-
-    return exists
-
-  @staticmethod
-  def change_principal_password(identity, auth_identity=None):
-    success = False
-
-    if identity is not None:
-      principal = get_property_value(identity, 'principal')
-
-      if (principal is not None) and (len(principal) > 0):
-        password = get_property_value(identity, 'password')
-
-        if password is None:
-          credentials = '-randkey'
-        else:
-          credentials = '-pw "%s"' % password
-
-        try:
-          result_code, output = KerberosScript.invoke_kadmin(
-            'change_password %s %s' % (credentials, principal),
-            auth_identity)
-
-          success = (result_code == 0)
-        except:
-          raise Fail("Failed to create principal: %s" % principal)
-
-    return success
-
-  @staticmethod
-  def create_principal(identity, auth_identity=None):
-    success = False
-
-    if identity is not None:
-      principal = get_property_value(identity, 'principal')
-
-      if (principal is not None) and (len(principal) > 0):
-        password = get_property_value(identity, 'password')
-
-        if password is None:
-          credentials = '-randkey'
-        else:
-          credentials = '-pw "%s"' % password
-
-        try:
-          result_code, out = KerberosScript.invoke_kadmin(
-            'addprinc %s %s' % (credentials, principal),
-            auth_identity)
-
-          success = (result_code == 0)
-        except:
-          raise Fail("Failed to create principal: %s" % principal)
-
-    return success
-
-  @staticmethod
-  def create_principals(identities, auth_identity=None):
-    if identities is not None:
-      for identity in identities:
-        KerberosScript.create_principal(identity, auth_identity)
-
-  @staticmethod
-  def create_or_update_administrator_identity():
-    import params
-
-    if params.realm is not None:
-      admin_identity = params.get_property_value(params.realm, 'admin_identity')
-
-      if KerberosScript.principal_exists(admin_identity):
-        KerberosScript.change_principal_password(admin_identity)
-      else:
-        KerberosScript.create_principal(admin_identity)
-
-  @staticmethod
-  def test_kinit(identity):
-    principal = get_property_value(identity, 'principal')
-
-    if principal is not None:
-      keytab_file = get_property_value(identity, 'keytab_file')
-      keytab = get_property_value(identity, 'keytab')
-      password = get_property_value(identity, 'password')
-
-      # If a test keytab file is available, simply use it
-      if (keytab_file is not None) and (os.path.isfile(keytab_file)):
-        command = 'kinit -k -t %s %s' % (keytab_file, principal)
-        shell.checked_call(command)
-        return shell.checked_call('kdestroy')
-
-      # If base64-encoded test keytab data is available; then decode it, write it to a temporary file
-      # use it, and then remove the temporary file
-      elif keytab is not None:
-        (fd, test_keytab_file) = tempfile.mkstemp()
-        os.write(fd, base64.b64decode(keytab))
-        os.close(fd)
-
-        try:
-          command = 'kinit -k -t %s %s' % (test_keytab_file, principal)
-          shell.checked_call(command)
-          return shell.checked_call('kdestroy')
-        except:
-          raise
-        finally:
-          if test_keytab_file is not None:
-            os.remove(test_keytab_file)
-
-      # If no keytab data is available and a password was supplied, simply use it.
-      elif password is not None:
-        process = subprocess.Popen(['kinit', principal], stdin=subprocess.PIPE)
-        stdout, stderr = process.communicate(password)
-        if process.returncode:
-          err_msg = Logger.get_protected_text("Execution of kinit returned %d. %s" % (process.returncode, stderr))
-          raise Fail(err_msg)
-        else:
-          return shell.checked_call('kdestroy')
-      else:
-        return 0, ''
-    else:
-      return 0, ''
-
-
-  @staticmethod
-  def write_keytab_file():
-    import params
-
-    if params.keytab_details is not None:
-      data = get_property_value(params.keytab_details, 'data')
-
-      if (data is not None) and (len(data) > 0):
-        file_path = get_property_value(params.keytab_details, 'file-path')
-
-        if (file_path is not None) and (len(file_path) > 0):
-          with open(file_path, 'w') as f:
-            f.write(base64.b64decode(data))
-
-          KerberosScript._set_file_access(file_path, params.keytab_details, params.default_group)
-
-  def delete_keytab_file(self):
-    import params
-
-    if params.kerberos_command_params is not None:
-      for item in params.kerberos_command_params:
-        keytab_file_path = get_property_value(item, 'keytab_file_path')
-        if (keytab_file_path is not None) and (len(keytab_file_path) > 0):
-          print 'Removing keytab file, ', keytab_file_path, "\n"
-          remove_file(keytab_file_path)
-
-          principal = get_property_value(item, 'principal')
-          if principal is not None:
-            curr_content = Script.structuredOut
-
-            if "keytabs" not in curr_content:
-              curr_content['keytabs'] = {}
-
-            curr_content['keytabs'][principal.replace("_HOST", params.hostname)] = '_REMOVED_'
-
-            self.put_structured_out(curr_content)
-
-  @staticmethod
-  def _set_file_access(file_path, access_details, default_group=None):
-    if (file_path is not None) and os.path.isfile(file_path) and (access_details is not None):
-      import stat
-      import pwd
-      import grp
-
-      owner = get_property_value(access_details, 'owner/name')
-      owner_access = get_property_value(access_details, 'owner/access', 'rw')
-      group = get_property_value(access_details, 'group/name', default_group)
-      group_access = get_property_value(access_details, 'group/access', '')
-
-      pwnam = pwd.getpwnam(owner) if (owner is not None) and (len(owner) > 0) else None
-      uid = pwnam.pw_uid if pwnam is not None else os.geteuid()
-
-      grnam = grp.getgrnam(group) if (group is not None) and (len(group) > 0) else None
-      gid = grnam.gr_gid if grnam is not None else os.getegid()
-
-      chmod = 0
-
-      if owner_access == 'r':
-        chmod |= stat.S_IREAD
-      else:
-        chmod |= stat.S_IREAD | stat.S_IWRITE
-
-      if group_access == 'rw':
-        chmod |= stat.S_IRGRP | stat.S_IWGRP
-      elif group_access == 'r':
-        chmod |= stat.S_IRGRP
-
-      os.chmod(file_path, chmod)
-      os.chown(file_path, uid, gid)

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_server.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_server.py
deleted file mode 100644
index 3e15f50..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/kerberos_server.py
+++ /dev/null
@@ -1,144 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from kerberos_common import *
-
-class KerberosServer(KerberosScript):
-  @staticmethod
-  def write_kadm5_acl():
-    import params
-
-    Directory(params.kadm5_acl_dir,
-              owner='root',
-              recursive=True,
-              group='root',
-              mode=0700
-    )
-
-    if (params.kadm5_acl_template is None) or not params.kadm5_acl_template.strip():
-      content = Template('kadm5_acl.j2')
-    else:
-      content = InlineTemplate(params.kadm5_acl_template)
-
-    File(params.kadm5_acl_path,
-         content=content,
-         owner='root',
-         group='root',
-         mode=0600
-    )
-
-  @staticmethod
-  def write_kdc_conf():
-    import params
-
-    Directory(params.kdc_conf_dir,
-              owner='root',
-              recursive=True,
-              group='root',
-              mode=0700
-    )
-
-    if (params.kdc_conf_template is None) or not params.kdc_conf_template.strip():
-      content = Template('kdc_conf.j2')
-    else:
-      content = InlineTemplate(params.kdc_conf_template)
-
-    File(params.kdc_conf_path,
-         content=content,
-         owner='root',
-         group='root',
-         mode=0600
-    )
-
-  def install(self, env):
-    import params
-
-    self.install_packages(env)
-    self.configure(env)
-
-    # Create the Kerberos database (only on install, for now)
-    Execute(
-      "%s create -s -P '%s'" % (params.kdb5_util_path, KerberosScript.create_random_password()))
-
-    # Create or update the administrator account
-    KerberosScript.create_or_update_administrator_identity()
-
-
-  def start(self, env):
-    os_family = System.get_instance().os_family
-
-    # Attempt to reconfigure the service before starting
-    self.configure(env)
-
-    # Create or update the administrator account
-    KerberosScript.create_or_update_administrator_identity()
-
-    if os_family == "suse":
-      Execute('rckadmind start')
-      Execute('rckrb5kdc start')
-    elif os_family == 'ubuntu':
-      Execute('service krb5-kdc start')
-      Execute('service krb5-admin-server start')
-    else:
-      Execute('service krb5kdc start')
-      Execute('service kadmin start')
-
-  def stop(self, env):
-    os_family = System.get_instance().os_family
-
-    if os_family == "suse":
-      Execute('rckadmind stop')
-      Execute('rckrb5kdc stop')
-    elif os_family == 'ubuntu':
-      Execute('service krb5-kdc stop')
-      Execute('service krb5-admin-server stop')
-    else:
-      Execute('service krb5kdc stop')
-      Execute('service kadmin stop')
-
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-
-    KerberosServer.write_krb5_conf()
-    KerberosServer.write_kdc_conf()
-    KerberosServer.write_kadm5_acl()
-
-  def status(self, env):
-    import params
-
-    if params.os_family == "suse":
-      try:
-        Execute('checkproc `which krb5kdc`')
-        Execute('checkproc `which kadmind`')
-      except Fail as ex:
-        raise ComponentIsNotRunning()
-
-    elif params.os_family == 'ubuntu':
-      check_process_status(params.kdamin_pid_path)
-      check_process_status(params.krb5kdc_pid_path)
-
-    else:
-      check_process_status(params.kdamin_pid_path)
-      check_process_status(params.krb5kdc_pid_path)
-
-
-if __name__ == "__main__":
-  KerberosServer().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/params.py
deleted file mode 100644
index 1c2061a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/params.py
+++ /dev/null
@@ -1,189 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-from utils import get_property_value, get_unstructured_data
-
-os_family = System.get_instance().os_family
-
-krb5_conf_dir = '/etc'
-krb5_conf_file = 'krb5.conf'
-krb5_conf_path = krb5_conf_dir + '/' + krb5_conf_file
-
-if os_family == 'suse':
-  kdc_conf_dir = '/var/lib/kerberos/krb5kdc'
-elif os_family == 'ubuntu':
-  kdc_conf_dir = '/etc/krb5kdc'
-else:
-  kdc_conf_dir = '/var/kerberos/krb5kdc'
-kdc_conf_file = 'kdc.conf'
-kdc_conf_path = kdc_conf_dir + '/' + kdc_conf_file
-
-kadm5_acl_dir = kdc_conf_dir  # Typically kadm5.acl and kdc.conf exist in the same directory
-kadm5_acl_file = 'kadm5.acl'
-kadm5_acl_path = kadm5_acl_dir + '/' + kadm5_acl_file
-
-config = Script.get_config()
-
-command_params = None
-configurations = None
-keytab_details = None
-default_group = None
-cluster_env = None
-kdc_server_host = None
-cluster_host_info = None
-
-kdb5_util_path = 'kdb5_util'
-
-kdamin_pid_path = '/var/run/kadmind.pid'
-krb5kdc_pid_path = '/var/run/krb5kdc.pid'
-
-smoke_test_principal = None
-smoke_test_keytab_file = None
-
-# If a test keytab file is available, simply use it
-
-
-if config is not None:
-  command_params = get_property_value(config, 'commandParams')
-  if command_params is not None:
-    keytab_details = get_unstructured_data(command_params, 'keytab')
-
-  configurations = get_property_value(config, 'configurations')
-  if configurations is not None:
-    cluster_env = get_property_value(configurations, 'cluster-env')
-
-    if cluster_env is not None:
-      smoke_test_principal = get_property_value(cluster_env, 'smokeuser')
-      smoke_test_keytab_file = get_property_value(cluster_env, 'smokeuser_keytab')
-
-      default_group = get_property_value(cluster_env, 'user_group')
-
-      if default_group is None:
-        default_group = get_property_value(cluster_env, 'user-group')
-
-  cluster_host_info = get_property_value(config, 'clusterHostInfo')
-  if cluster_host_info is not None:
-    kdc_server_hosts = get_property_value(cluster_host_info, 'kdc_server_hosts')
-
-    if (kdc_server_hosts is not None) and (len(kdc_server_hosts) > 0):
-      kdc_server_host = kdc_server_hosts[0]
-
-  # ################################################################################################
-  # Get krb5.conf template data
-  # ################################################################################################
-  realm = 'EXAMPLE.COM'
-  domains = ''
-  kdc_host = 'localhost'
-  admin_server_host = None
-  admin_principal = None
-  admin_password = None
-  admin_keytab = None
-  test_principal = None
-  test_password = None
-  test_keytab = None
-  test_keytab_file = None
-
-  krb5_conf_template = None
-
-  encryption_types = None
-  manage_krb5_conf = "true"
-  krb5_conf_template = None
-
-  krb5_conf_data = get_property_value(configurations, 'krb5-conf')
-
-  kerberos_env = get_property_value(configurations, "kerberos-env")
-
-  if kerberos_env is not None:
-    encryption_types = get_property_value(kerberos_env, "encryption_types", None)
-    realm = get_property_value(kerberos_env, "realm", None)
-    kdc_host = get_property_value(kerberos_env, 'kdc_host', kdc_host)
-    admin_server_host = get_property_value(kerberos_env, 'admin_server_host', admin_server_host)
-
-  if krb5_conf_data is not None:
-    realm = get_property_value(krb5_conf_data, 'realm', realm)
-    domains = get_property_value(krb5_conf_data, 'domains', domains)
-
-    admin_principal = get_property_value(krb5_conf_data, 'admin_principal', admin_principal)
-    admin_password = get_property_value(krb5_conf_data, 'admin_password', admin_password)
-    admin_keytab = get_property_value(krb5_conf_data, 'admin_keytab', admin_keytab)
-
-    # If the admin keytab is just white space, set it to None
-    if admin_keytab is not None:
-      admin_keytab = admin_keytab.strip()
-
-      if len(admin_keytab) == 0:
-        admin_keytab = None
-
-    test_principal = get_property_value(krb5_conf_data, 'test_principal', test_principal)
-    test_password = get_property_value(krb5_conf_data, 'test_password', test_password)
-    test_keytab = get_property_value(krb5_conf_data, 'test_keytab', test_keytab)
-    test_keytab_file = get_property_value(krb5_conf_data, 'test_keytab_file', test_keytab_file)
-
-    # If the test keytab is just white space, set it to None
-    if test_keytab is not None:
-      test_keytab = test_keytab.strip()
-
-      if len(test_keytab) == 0:
-        test_keytab = None
-
-    krb5_conf_template = get_property_value(krb5_conf_data, 'content', krb5_conf_template)
-    krb5_conf_dir = get_property_value(krb5_conf_data, 'conf_dir', krb5_conf_dir)
-    krb5_conf_file = get_property_value(krb5_conf_data, 'conf_file', krb5_conf_file)
-    krb5_conf_path = krb5_conf_dir + '/' + krb5_conf_file
-
-    manage_krb5_conf = get_property_value(krb5_conf_data, 'manage_krb5_conf',
-                                          "true")
-
-  # ################################################################################################
-  # Get kdc.conf template data
-  # ################################################################################################
-  kdcdefaults_kdc_ports = "88"
-  kdcdefaults_kdc_tcp_ports = "88"
-
-  kdc_conf_template = None
-
-  kdc_conf_data = get_property_value(configurations, 'kdc-conf')
-
-  if kdc_conf_data is not None:
-    kdcdefaults_kdc_ports = get_property_value(kdc_conf_data, 'kdcdefaults_kdc_ports',
-                                               kdcdefaults_kdc_ports)
-    kdcdefaults_kdc_tcp_ports = get_property_value(kdc_conf_data, 'kdcdefaults_kdc_tcp_ports',
-                                                   kdcdefaults_kdc_tcp_ports)
-
-    kdc_conf_template = get_property_value(kdc_conf_data, 'content', kdc_conf_template)
-    kdc_conf_dir = get_property_value(kdc_conf_data, 'conf_dir', kdc_conf_dir)
-    kdc_conf_file = get_property_value(kdc_conf_data, 'conf_file', kdc_conf_file)
-    kdc_conf_path = kdc_conf_dir + '/' + kdc_conf_file
-
-  # ################################################################################################
-  # Get kadm5.acl template data
-  # ################################################################################################
-  kdcdefaults_kdc_ports = '88'
-  kdcdefaults_kdc_tcp_ports = '88'
-
-  kadm5_acl_template = None
-
-  kadm5_acl_data = get_property_value(configurations, 'kadm5-acl')
-
-  if kadm5_acl_data is not None:
-    kadm5_acl_template = get_property_value(kadm5_acl_data, 'content', kadm5_acl_template)
-    kadm5_acl_dir = get_property_value(kadm5_acl_data, 'conf_dir', kadm5_acl_dir)
-    kadm5_acl_file = get_property_value(kadm5_acl_data, 'conf_file', kadm5_acl_file)
-    kadm5_acl_path = kadm5_acl_dir + '/' + kadm5_acl_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/service_check.py
deleted file mode 100644
index 73b9c7a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/service_check.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Ambari Agent
-
-"""
-
-from kerberos_common import *
-from resource_management import *
-
-class KerberosServiceCheck(KerberosScript):
-  def service_check(self, env):
-    import params
-
-    # First attempt to test using the smoke test user, if data is available
-    if ((params.smoke_test_principal is not None) and
-          (params.smoke_test_keytab_file is not None) and
-          os.path.isfile(params.smoke_test_keytab_file)):
-      print "Performing kinit using smoke test user: %s" % params.smoke_test_principal
-      code, out = self.test_kinit({
-        'principal': params.smoke_test_principal,
-        'keytab_file': params.smoke_test_keytab_file
-      })
-      test_performed = True
-
-    # Else if a test credentials is specified, try to test using that
-    elif params.test_principal is not None:
-      print "Performing kinit using test user: %s" % params.test_principal
-      code, out = self.test_kinit({
-        'principal': params.test_principal,
-        'keytab_file': params.test_keytab_file,
-        'keytab': params.test_keytab,
-        'password': params.test_password
-      })
-      test_performed = True
-
-    else:
-      code = 0
-      out = ''
-      test_performed = False
-
-    if test_performed:
-      if code == 0:
-        print "Test executed successfully."
-      else:
-        print "Test failed with error code %d: %s." % (code, out)
-
-if __name__ == "__main__":
-  KerberosServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/utils.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/utils.py
deleted file mode 100644
index 79e89e6..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/scripts/utils.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-def get_property_value(dictionary, property_name, null_value=None):
-  return dictionary[property_name] if property_name in dictionary else null_value
-
-def get_unstructured_data(dictionary, property_name):
-  prefix = property_name + '/'
-  prefix_len = len(prefix)
-  return dict((k[prefix_len:], v) for k, v in dictionary.iteritems() if k.startswith(prefix))
-
-def split_host_and_port(host):
-  """
-  Splits a string into its host and port components
-
-  :param host: a string matching the following patern: <host name | ip address>[:port]
-  :return: a Dictionary containing 'host' and 'port' entries for the input value
-  """
-
-  if host is None:
-    host_and_port = None
-  else:
-    host_and_port = {}
-    parts = host.split(":")
-
-    if parts is not None:
-      length = len(parts)
-
-      if length > 0:
-        host_and_port['host'] = parts[0]
-
-        if length > 1:
-          host_and_port['port'] = int(parts[1])
-
-  return host_and_port
-
-def set_port(host, port):
-  """
-  Sets the port for a host specification, potentially replacing an existing port declaration
-
-  :param host: a string matching the following pattern: <host name | ip address>[:port]
-  :param port: a string or integer declaring the (new) port
-  :return: a string declaring the new host/port specification
-  """
-  if port is None:
-    return host
-  else:
-    host_and_port = split_host_and_port(host)
-
-    if (host_and_port is not None) and ('host' in host_and_port):
-      return "%s:%s" % (host_and_port['host'], port)
-    else:
-      return host

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kadm5_acl.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kadm5_acl.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kadm5_acl.j2
deleted file mode 100644
index d82ae23..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kadm5_acl.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-*/admin@{{realm}}	*
-
-{# Append additional realm declarations should be placed below #}

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kdc_conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kdc_conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kdc_conf.j2
deleted file mode 100644
index f78adc7..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/kdc_conf.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-[kdcdefaults]
-  kdc_ports = {{kdcdefaults_kdc_ports}}
-  kdc_tcp_ports = {{kdcdefaults_kdc_tcp_ports}}
-
-[realms]
-  {{realm}} = {
-    acl_file = {{kadm5_acl_path}}
-    dict_file = /usr/share/dict/words
-    admin_keytab = {{kadm5_acl_dir}}/kadm5.keytab
-    supported_enctypes = {{encryption_types}}
-  }
-
-{# Append additional realm declarations should be placed below #}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/627401f6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/krb5_conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/krb5_conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/krb5_conf.j2
deleted file mode 100644
index cc6f63a..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KERBEROS/package/templates/krb5_conf.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-[libdefaults]
-  renew_lifetime = 7d
-  forwardable = true
-  default_realm = {{realm|upper()}}
-  ticket_lifetime = 24h
-  dns_lookup_realm = false
-  dns_lookup_kdc = false
-  #default_tgs_enctypes = {{encryption_types}}
-  #default_tkt_enctypes = {{encryption_types}}
-
-{% if domains %}
-[domain_realm]
-{% for domain in domains.split(',') %}
-  {{domain}} = {{realm|upper()}}
-{% endfor %}
-{% endif %}
-
-[logging]
-  default = FILE:/var/log/krb5kdc.log
-  admin_server = FILE:/var/log/kadmind.log
-  kdc = FILE:/var/log/krb5kdc.log
-
-[realms]
-  {{realm}} = {
-    admin_server = {{admin_server_host|default(kdc_host, True)}}
-    kdc = {{kdc_host}}
-  }
-
-{# Append additional realm declarations below #}
\ No newline at end of file