You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/05/16 17:14:00 UTC
git commit: AMBARI-5789. Rpm type in metainfo.xml confusing on Ubuntu
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 147844591 -> 7e8c4aad1
AMBARI-5789. Rpm type in metainfo.xml confusing on Ubuntu (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e8c4aad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e8c4aad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e8c4aad
Branch: refs/heads/trunk
Commit: 7e8c4aad1b70532f57a077a2bf7341c734065214
Parents: 1478445
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri May 16 18:13:36 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri May 16 18:13:36 2014 +0300
----------------------------------------------------------------------
.../apache/ambari/server/state/ServiceOsSpecific.java | 5 -----
.../stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml | 10 ----------
.../stacks/HDP/1.3.2/services/HBASE/metainfo.xml | 1 -
.../stacks/HDP/1.3.2/services/HDFS/metainfo.xml | 11 -----------
.../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 6 ------
.../stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml | 10 ----------
.../stacks/HDP/1.3.2/services/OOZIE/metainfo.xml | 3 ---
.../stacks/HDP/1.3.2/services/PIG/metainfo.xml | 1 -
.../stacks/HDP/1.3.2/services/SQOOP/metainfo.xml | 2 --
.../stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml | 3 ---
.../stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml | 1 -
.../stacks/HDP/2.0.6/services/FLUME/metainfo.xml | 1 -
.../stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml | 10 ----------
.../stacks/HDP/2.0.6/services/HBASE/metainfo.xml | 1 -
.../stacks/HDP/2.0.6/services/HDFS/metainfo.xml | 14 --------------
.../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 6 ------
.../stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml | 10 ----------
.../stacks/HDP/2.0.6/services/OOZIE/metainfo.xml | 6 ------
.../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 1 -
.../stacks/HDP/2.0.6/services/SQOOP/metainfo.xml | 2 --
.../stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml | 3 ---
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 7 -------
.../stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 1 -
.../HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml | 1 -
.../HDP/2.1.GlusterFS/services/YARN/metainfo.xml | 7 -------
.../stacks/HDP/2.1/services/FALCON/metainfo.xml | 1 -
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 1 -
.../stacks/HDP/2.1/services/OOZIE/metainfo.xml | 8 --------
.../stacks/HDP/2.1/services/STORM/metainfo.xml | 1 -
.../stacks/HDP/2.1/services/TEZ/metainfo.xml | 1 -
.../stacks/HDP/2.1/services/WEBHCAT/metainfo.xml | 3 ---
.../stacks/HDP/2.1/services/YARN/metainfo.xml | 5 -----
.../server/api/util/StackExtensionHelperTest.java | 2 --
.../stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml | 10 ----------
.../stacks/HDP/1.3.4/services/HBASE/metainfo.xml | 1 -
.../stacks/HDP/1.3.4/services/HDFS/metainfo.xml | 11 -----------
.../stacks/HDP/1.3.4/services/HIVE/metainfo.xml | 7 -------
.../stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml | 12 ------------
.../stacks/HDP/1.3.4/services/OOZIE/metainfo.xml | 3 ---
.../stacks/HDP/1.3.4/services/PIG/metainfo.xml | 1 -
.../stacks/HDP/1.3.4/services/SQOOP/metainfo.xml | 2 --
.../stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml | 3 ---
.../stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml | 1 -
.../stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml | 11 -----------
.../stacks/HDP/2.0.7/services/HBASE/metainfo.xml | 2 --
.../stacks/HDP/2.0.7/services/HDFS/metainfo.xml | 1 -
.../stacks/HDP/2.0.7/services/YARN/metainfo.xml | 7 -------
.../stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml | 1 -
.../stacks/HDP/2.0.8/services/HDFS/metainfo.xml | 1 -
.../stacks/HDP/2.1.1/services/STORM/metainfo.xml | 1 -
50 files changed, 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java
index e317ece..cd6f689 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java
@@ -119,13 +119,8 @@ public class ServiceOsSpecific {
*/
@XmlAccessorType(XmlAccessType.FIELD)
public static class Package {
- private String type;
private String name;
- public String getType() {
- return type;
- }
-
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
index a13a56e..3f97445 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml
@@ -53,31 +53,24 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>libganglia-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmetad-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>python-rrdtool.x86_64</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-modules-python-3.5.0-99</name>
</package>
</packages>
@@ -86,11 +79,9 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>apache2</name>
</package>
<package>
- <type>rpm</type>
<name>apache2?mod_php*</name>
</package>
</packages>
@@ -99,7 +90,6 @@
<osFamily>redhat5,redhat6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>httpd</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
index 21f0de9..baf98df 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/metainfo.xml
@@ -99,7 +99,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hbase</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
index cad0f55..5c28cf3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/metainfo.xml
@@ -83,47 +83,36 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>lzo</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-libhdfs</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-native</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-pipes</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-sbin</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo-0.5.0</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo-native-0.5.0</name>
</package>
<package>
- <type>rpm</type>
<name>snappy</name>
</package>
<package>
- <type>rpm</type>
<name>snappy-devel</name>
</package>
<package>
- <type>rpm</type>
<name>ambari-log4j</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
index 8d1b9b9..6e057d2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
@@ -98,15 +98,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hive</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
<package>
- <type>rpm</type>
<name>mysql</name>
</package>
</packages>
@@ -115,7 +112,6 @@
<osFamily>redhat5,redhat6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-server</name>
</package>
</packages>
@@ -124,7 +120,6 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-client</name>
</package>
</packages>
@@ -164,7 +159,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
index 21949c4..686c89a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
@@ -69,31 +69,24 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>perl</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-plugins-1.4.9</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-www-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>fping</name>
</package>
<package>
- <type>rpm</type>
<name>hdp_mon_nagios_addons</name>
</package>
</packages>
@@ -102,11 +95,9 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php5-json</name>
</package>
<package>
- <type>rpm</type>
<name>apache2?mod_php*</name>
</package>
</packages>
@@ -115,7 +106,6 @@
<osFamily>redhat5</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
index e6cd199..f564635 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/metainfo.xml
@@ -83,15 +83,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>oozie.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>oozie-client.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>extjs-2.2-1</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
index 4121867..fb09b2f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/metainfo.xml
@@ -39,7 +39,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml
index 327c6d8..2c84ea5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/SQOOP/metainfo.xml
@@ -57,11 +57,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>sqoop</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml
index 78703e9..0ea163b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/metainfo.xml
@@ -70,15 +70,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-hive</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
index 211551b..d3e6ee0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/metainfo.xml
@@ -51,7 +51,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>zookeeper</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml
index 8e3dca0..0e25020 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml
@@ -39,7 +39,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>flume</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
index 1107087..3a181b8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml
@@ -48,31 +48,24 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>libganglia-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmetad-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>python-rrdtool.x86_64</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-modules-python-3.5.0-99</name>
</package>
</packages>
@@ -81,11 +74,9 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>apache2</name>
</package>
<package>
- <type>rpm</type>
<name>apache2?mod_php*</name>
</package>
</packages>
@@ -94,7 +85,6 @@
<osFamily>redhat5,redhat6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>httpd</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
index 6842c38..bf4e40b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metainfo.xml
@@ -87,7 +87,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hbase</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
index 63f3968..4b498a7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metainfo.xml
@@ -100,11 +100,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo</name>
</package>
</packages>
@@ -114,27 +112,21 @@
<osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>snappy</name>
</package>
<package>
- <type>rpm</type>
<name>snappy-devel</name>
</package>
<package>
- <type>rpm</type>
<name>lzo</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo-native</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-libhdfs</name>
</package>
<package>
- <type>rpm</type>
<name>ambari-log4j</name>
</package>
</packages>
@@ -144,27 +136,21 @@
<osFamily>debian12</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>libsnappy1</name>
</package>
<package>
- <type>rpm</type>
<name>libsnappy-dev</name>
</package>
<package>
- <type>rpm</type>
<name>liblzo2-2</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-hdfs</name>
</package>
<package>
- <type>rpm</type>
<name>libhdfs0</name>
</package>
<package>
- <type>rpm</type>
<name>libhdfs0-dev</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
index 2d90f52..d6b8fd2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
@@ -111,11 +111,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hive</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
@@ -124,7 +122,6 @@
<osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql</name>
</package>
</packages>
@@ -133,7 +130,6 @@
<osFamily>redhat5,redhat6,debian12</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-server</name>
</package>
</packages>
@@ -142,7 +138,6 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-client</name>
</package>
</packages>
@@ -181,7 +176,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
index 35c9d9d..570ecd8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
@@ -83,31 +83,24 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>perl</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-plugins-1.4.9</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-www-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>fping</name>
</package>
<package>
- <type>rpm</type>
<name>hdp_mon_nagios_addons</name>
</package>
</packages>
@@ -116,11 +109,9 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php5-json</name>
</package>
<package>
- <type>rpm</type>
<name>apache2?mod_php*</name>
</package>
</packages>
@@ -129,7 +120,6 @@
<osFamily>redhat5</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
index b56bb49..ab7571b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/metainfo.xml
@@ -90,15 +90,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>oozie</name>
</package>
<package>
- <type>rpm</type>
<name>oozie-client</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
@@ -108,7 +105,6 @@
<osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>extjs-2.2-1</name>
</package>
</packages>
@@ -118,11 +114,9 @@
<osFamily>debian12</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>extjs</name>
</package>
<package>
- <type>rpm</type>
<name>libxml2-utils</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
index c8a3cf4..4863e56 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/metainfo.xml
@@ -39,7 +39,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
index 50e3e77..882b2ad 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
@@ -57,11 +57,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>sqoop</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
index 63cff93..bdc89b5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/metainfo.xml
@@ -77,15 +77,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-hive</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
index 87619dd..3d3ecc2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
@@ -74,23 +74,18 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-yarn</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-nodemanager</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-proxyserver</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-resourcemanager</name>
</package>
</packages>
@@ -160,11 +155,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce-historyserver</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
index 51f4a16..fc09417 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/metainfo.xml
@@ -51,7 +51,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>zookeeper</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml
index 629893d..49bf580 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/metainfo.xml
@@ -39,7 +39,6 @@
<osFamily>any<osFamily>
<packages>
<package>
- <type>rpm</type>
<name>glusterfs</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
index 61b32a1..5e38538 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
@@ -71,23 +71,18 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-yarn</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-nodemanager</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-proxyserver</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-resourcemanager</name>
</package>
</packages>
@@ -142,11 +137,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce-historyserver</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml
index 1126873..f878d77 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml
@@ -48,7 +48,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>falcon</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
index 860aa6b..a816cc8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
@@ -41,7 +41,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hive-hcatalog</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
index 1d203ea..eda7af5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
@@ -29,23 +29,18 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>oozie</name>
</package>
<package>
- <type>rpm</type>
<name>oozie-client</name>
</package>
<package>
- <type>rpm</type>
<name>falcon</name>
</package>
<package>
- <type>rpm</type>
<name>zip</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
@@ -55,7 +50,6 @@
<osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>extjs-2.2-1</name>
</package>
</packages>
@@ -65,11 +59,9 @@
<osFamily>debian12</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>extjs</name>
</package>
<package>
- <type>rpm</type>
<name>libxml2-utils</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml
index df7d69f..e715aa6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml
@@ -81,7 +81,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>storm</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml
index dd574bf..0fe986b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/metainfo.xml
@@ -38,7 +38,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>tez</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml
index 8f51a93..fc985f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml
@@ -27,15 +27,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hive-webhcat</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-hive</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml
index 9a3ea37..fa8c596 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml
@@ -43,23 +43,18 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-yarn</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-nodemanager</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-proxyserver</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-resourcemanager</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
index 65ddc69..919c32f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
@@ -120,7 +120,6 @@ public class StackExtensionHelperTest {
assertTrue(specifics.size() == 2);
ServiceOsSpecific anyOs = specifics.get(AmbariMetaInfo.ANY_OS);
assertEquals(AmbariMetaInfo.ANY_OS, anyOs.getOsFamily());
- assertEquals("rpm", anyOs.getPackages().get(0).getType());
assertEquals("wget", anyOs.getPackages().get(0).getName());
// Test default timeout value
@@ -131,7 +130,6 @@ public class StackExtensionHelperTest {
ServiceOsSpecific c6Os = specifics.get("centos6");
assertEquals("centos6", c6Os.getOsFamily());
- assertEquals("rpm", c6Os.getPackages().get(0).getType());
assertEquals("hbase", c6Os.getPackages().get(0).getName());
assertEquals("http://something.com/centos6/2.x/updates/1",
c6Os.getRepo().getBaseUrl());
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml
index d396a58..3f9c345 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/GANGLIA/metainfo.xml
@@ -53,31 +53,24 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>libganglia-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmetad-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-web-3.5.7-99.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>python-rrdtool.x86_64</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>ganglia-gmond-modules-python-3.5.0-99</name>
</package>
</packages>
@@ -85,18 +78,15 @@
<osSpecific>
<osFamily>suse</osFamily>
<package>
- <type>rpm</type>
<name>apache2</name>
</package>
<package>
- <type>rpm</type>
<name>apache2-mod_php5</name>
</package>
</osSpecific>
<osSpecific>
<osFamily>centos6</osFamily>
<package>
- <type>rpm</type>
<name>httpd</name>
</package>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HBASE/metainfo.xml
index 487c88b..66c80fa 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HBASE/metainfo.xml
@@ -99,7 +99,6 @@
<osFamily>centos6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hbase</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml
index f990385..d13d90b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml
@@ -83,47 +83,36 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>lzo</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-libhdfs</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-native</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-pipes</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-sbin</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-lzo-native</name>
</package>
<package>
- <type>rpm</type>
<name>snappy</name>
</package>
<package>
- <type>rpm</type>
<name>snappy-devel</name>
</package>
<package>
- <type>rpm</type>
<name>ambari-log4j</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HIVE/metainfo.xml
index 160a603..3b49f40 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HIVE/metainfo.xml
@@ -91,15 +91,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hive</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
<package>
- <type>rpm</type>
<name>mysql</name>
</package>
</packages>
@@ -108,7 +105,6 @@
<osFamily>centos6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-server</name>
</package>
</packages>
@@ -117,7 +113,6 @@
<osFamily>centos5</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-server</name>
</package>
</packages>
@@ -126,7 +121,6 @@
<osFamily>suse</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>mysql-client</name>
</package>
</packages>
@@ -164,7 +158,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
index 5e350eb..4b0e6b1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
@@ -39,35 +39,27 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>perl</name>
</package>
<package>
- <type>rpm</type>
<name>perl-Net-SNMP</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-plugins-1.4.9</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-www-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-devel-3.5.0-99</name>
</package>
<package>
- <type>rpm</type>
<name>fping</name>
</package>
<package>
- <type>rpm</type>
<name>hdp_mon_nagios_addons</name>
</package>
</packages>
@@ -75,28 +67,24 @@
<osSpecific>
<osFamily>suse</osFamily>
<package>
- <type>rpm</type>
<name>php5-json</name>
</package>
</osSpecific>
<osSpecific>
<osFamily>centos5</osFamily>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</osSpecific>
<osSpecific>
<osFamily>redhat5</osFamily>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</osSpecific>
<osSpecific>
<osFamily>oraclelinux5</osFamily>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/OOZIE/metainfo.xml
index 7820223..aab5ccc 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/OOZIE/metainfo.xml
@@ -83,15 +83,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>oozie.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>oozie-client.noarch</name>
</package>
<package>
- <type>rpm</type>
<name>extjs-2.2-1</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/PIG/metainfo.xml
index 67ac448..c9c4c03 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/PIG/metainfo.xml
@@ -39,7 +39,6 @@
<osFamily>centos6</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/SQOOP/metainfo.xml
index 327c6d8..2c84ea5 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/SQOOP/metainfo.xml
@@ -57,11 +57,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>sqoop</name>
</package>
<package>
- <type>rpm</type>
<name>mysql-connector-java</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml
index 78703e9..0ea163b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/WEBHCAT/metainfo.xml
@@ -70,15 +70,12 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hcatalog</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-hive</name>
</package>
<package>
- <type>rpm</type>
<name>webhcat-tar-pig</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml
index c43972d..4182a79 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/ZOOKEEPER/metainfo.xml
@@ -51,7 +51,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>zookeeper</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
index 3a06b91..28c73b5 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
@@ -38,35 +38,27 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>perl</name>
</package>
<package>
- <type>rpm</type>
<name>perl-Net-SNMP</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-plugins</name>
</package>
<package>
- <type>rpm</type>
<name>nagios</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-www</name>
</package>
<package>
- <type>rpm</type>
<name>nagios-devel</name>
</package>
<package>
- <type>rpm</type>
<name>fping</name>
</package>
<package>
- <type>rpm</type>
<name>hdp_mon_nagios_addons</name>
</package>
</packages>
@@ -75,11 +67,9 @@
<osFamily>suse11</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php5-json</name>
</package>
<package>
- <type>rpm</type>
<name>apache2-mod_php5</name>
</package>
</packages>
@@ -88,7 +78,6 @@
<osFamily>redhat5</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>php-pecl-json.x86_64</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml
index b5b7667..c114c83 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml
@@ -78,7 +78,6 @@
<osFamily>any</osFamily> <!-- Specifics, common for all OSs-->
<packages>
<package>
- <type>rpm</type>
<name>wget</name>
</package>
</packages>
@@ -92,7 +91,6 @@
</repo>
<packages>
<package>
- <type>rpm</type>
<name>hbase</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metainfo.xml
index 7f718d3..74f47e7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metainfo.xml
@@ -108,7 +108,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>parent-package-def</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/metainfo.xml
index 4d19497..426f275 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/metainfo.xml
@@ -70,23 +70,18 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-yarn</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-nodemanager</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-proxyserver</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-yarn-resourcemanager</name>
</package>
</packages>
@@ -140,11 +135,9 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce</name>
</package>
<package>
- <type>rpm</type>
<name>hadoop-mapreduce-historyserver</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml
index 51f4a16..fc09417 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/ZOOKEEPER/metainfo.xml
@@ -51,7 +51,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>zookeeper</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml
index 9c91971..d3bef74 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml
@@ -108,7 +108,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>child-package-def</name>
</package>
</packages>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e8c4aad/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
index b285bad..2552cbe 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/STORM/metainfo.xml
@@ -83,7 +83,6 @@
<osFamily>any</osFamily>
<packages>
<package>
- <type>rpm</type>
<name>storm</name>
</package>
</packages>