ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] git commit: AMBARI-5373. metainfo.xml should support os families not os types (aonishuk)
Date Tue, 08 Apr 2014 19:12:53 GMT
AMBARI-5373. metainfo.xml should support os families not os types (aonishuk)


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

Branch: refs/heads/trunk
Commit: 01bd864f1cbe8f497e309469f3ec776419b98269
Parents: c39fcb3
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Tue Apr 8 12:12:40 2014 -0700
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Tue Apr 8 12:12:40 2014 -0700

----------------------------------------------------------------------
 .../AmbariCustomCommandExecutionHelper.java     |   4 +-
 .../AmbariManagementControllerImpl.java         |   6 +-
 .../org/apache/ambari/server/state/Host.java    |  11 +
 .../apache/ambari/server/state/ServiceInfo.java |   6 +-
 .../ambari/server/state/ServiceOsSpecific.java  |   6 +-
 .../server/state/cluster/ClustersImpl.java      |   7 +-
 .../ambari/server/state/host/HostImpl.java      |  11 +
 .../stacks/HDP/1.2.0/repos/repoinfo.xml         |  41 --
 .../stacks/HDP/1.2.1/repos/repoinfo.xml         |  35 --
 .../stacks/HDP/1.3.0/repos/repoinfo.xml         |  35 --
 .../HDP/1.3.2.GlusterFS/repos/repoinfo.xml      |  35 --
 .../stacks/HDP/1.3.2/repos/repoinfo.xml         |  35 --
 .../HDP/1.3.2/services/GANGLIA/metainfo.xml     |  28 +-
 .../HDP/1.3.2/services/HBASE/metainfo.xml       |   2 +-
 .../stacks/HDP/1.3.2/services/HDFS/metainfo.xml |   2 +-
 .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml |  62 +--
 .../HDP/1.3.2/services/NAGIOS/metainfo.xml      |  37 +-
 .../HDP/1.3.2/services/OOZIE/metainfo.xml       |   2 +-
 .../stacks/HDP/1.3.2/services/PIG/metainfo.xml  |   2 +-
 .../HDP/1.3.2/services/SQOOP/metainfo.xml       |   2 +-
 .../HDP/1.3.2/services/WEBHCAT/metainfo.xml     |   2 +-
 .../HDP/1.3.2/services/ZOOKEEPER/metainfo.xml   |   2 +-
 .../stacks/HDP/1.3.3/repos/repoinfo.xml         |  35 --
 .../stacks/HDP/2.0.5/repos/repoinfo.xml         |  21 -
 .../HDP/2.0.6.GlusterFS/repos/repoinfo.xml      |  35 --
 .../stacks/HDP/2.0.6/repos/repoinfo.xml         |  35 --
 .../HDP/2.0.6/services/GANGLIA/metainfo.xml     |  64 +--
 .../HDP/2.0.6/services/HBASE/metainfo.xml       |   2 +-
 .../stacks/HDP/2.0.6/services/HDFS/metainfo.xml |   2 +-
 .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml |  20 +-
 .../HDP/2.0.6/services/NAGIOS/metainfo.xml      |  37 +-
 .../HDP/2.0.6/services/OOZIE/metainfo.xml       |   2 +-
 .../stacks/HDP/2.0.6/services/PIG/metainfo.xml  |   2 +-
 .../HDP/2.0.6/services/SQOOP/metainfo.xml       |   2 +-
 .../HDP/2.0.6/services/WEBHCAT/metainfo.xml     |   2 +-
 .../stacks/HDP/2.0.6/services/YARN/metainfo.xml |   4 +-
 .../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml   |   2 +-
 .../resources/stacks/HDP/2.0/repos/repoinfo.xml |  35 --
 .../resources/stacks/HDP/2.1/repos/repoinfo.xml |  37 +-
 .../stacks/HDP/2.1/services/FALCON/metainfo.xml |   2 +-
 .../stacks/HDP/2.1/services/HIVE/metainfo.xml   |   2 +-
 .../stacks/HDP/2.1/services/OOZIE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.1/services/STORM/metainfo.xml  |   2 +-
 .../stacks/HDP/2.1/services/TEZ/metainfo.xml    |   2 +-
 .../HDP/2.1/services/WEBHCAT/metainfo.xml       |   2 +-
 .../stacks/HDP/2.1/services/YARN/metainfo.xml   |   2 +-
 .../server/agent/TestHeartbeatHandler.java      |   8 +
 .../server/agent/TestHeartbeatMonitor.java      |  22 +-
 .../server/api/services/AmbariMetaInfoTest.java |   8 +-
 .../api/util/StackExtensionHelperTest.java      |   4 +-
 .../AmbariManagementControllerTest.java         | 540 +++++--------------
 .../internal/JMXHostProviderTest.java           |  22 +-
 .../StackDefinedPropertyProviderTest.java       |   5 +-
 .../server/state/ServiceComponentTest.java      |   8 +-
 .../server/state/cluster/ClusterTest.java       |   7 +-
 .../server/state/cluster/ClustersTest.java      |  24 +-
 .../ambari/server/state/host/HostTest.java      |  14 +-
 .../svccomphost/ServiceComponentHostTest.java   |  14 +-
 .../ambari/server/utils/TestStageUtils.java     |   7 +-
 .../resources/stacks/HDP/0.1/repos/repoinfo.xml |   2 +-
 .../resources/stacks/HDP/0.2/repos/repoinfo.xml |   2 +-
 .../HDP/1.3.4/services/GANGLIA/metainfo.xml     |   6 +-
 .../HDP/1.3.4/services/HBASE/metainfo.xml       |   2 +-
 .../stacks/HDP/1.3.4/services/HDFS/metainfo.xml |   2 +-
 .../stacks/HDP/1.3.4/services/HIVE/metainfo.xml |  10 +-
 .../HDP/1.3.4/services/NAGIOS/metainfo.xml      |  10 +-
 .../HDP/1.3.4/services/OOZIE/metainfo.xml       |   2 +-
 .../stacks/HDP/1.3.4/services/PIG/metainfo.xml  |   2 +-
 .../HDP/1.3.4/services/SQOOP/metainfo.xml       |   2 +-
 .../HDP/1.3.4/services/WEBHCAT/metainfo.xml     |   2 +-
 .../HDP/1.3.4/services/ZOOKEEPER/metainfo.xml   |   2 +-
 .../HDP/2.0.7/services/HBASE/metainfo.xml       |   4 +-
 .../stacks/HDP/2.0.7/services/HDFS/metainfo.xml |   2 +-
 .../stacks/HDP/2.0.7/services/YARN/metainfo.xml |   4 +-
 .../stacks/HDP/2.0.8/services/HDFS/metainfo.xml |   2 +-
 .../HDP/2.1.1/services/STORM/metainfo.xml       |   2 +-
 ambari-web/app/controllers/installer.js         |   2 +-
 ambari-web/app/views/wizard/step1_view.js       |  41 +-
 78 files changed, 364 insertions(+), 1144 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index c4dbc13..d55d965 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -735,14 +735,14 @@ public class AmbariCustomCommandExecutionHelper {
     Map<String, List<RepositoryInfo>> repos = ambariMetaInfo.getRepository(
         stackId.getStackName(), stackId.getStackVersion());
     String repoInfo = "";
-    if (!repos.containsKey(host.getOsType())) {
+    if (!repos.containsKey(host.getOsFamily())) {
       // FIXME should this be an error?
       LOG.warn("Could not retrieve repo information for host"
           + ", hostname=" + host.getHostName()
           + ", clusterName=" + cluster.getClusterName()
           + ", stackInfo=" + stackId.getStackId());
     } else {
-      repoInfo = gson.toJson(repos.get(host.getOsType()));
+      repoInfo = gson.toJson(repos.get(host.getOsFamily()));
     }
 
     return repoInfo;

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 1e8be84..2e2822c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1183,7 +1183,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     String serviceName = scHost.getServiceName();
     String componentName = event.getServiceComponentName();
     String hostname = scHost.getHostName();
-    String osType = clusters.getHost(hostname).getOsType();
+    String osFamily = clusters.getHost(hostname).getOsFamily();
     StackId stackId = cluster.getDesiredStackVersion();
     ServiceInfo serviceInfo = ambariMetaInfo.getServiceInfo(stackId.getStackName(),
       stackId.getStackVersion(), serviceName);
@@ -1277,8 +1277,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
       anyOs = serviceInfo.getOsSpecifics().get(AmbariMetaInfo.ANY_OS);
     }
     ServiceOsSpecific hostOs = null;
-    if (serviceInfo.getOsSpecifics().containsKey(osType)) {
-      hostOs = serviceInfo.getOsSpecifics().get(osType);
+    if (serviceInfo.getOsSpecifics().containsKey(osFamily)) {
+      hostOs = serviceInfo.getOsSpecifics().get(osFamily);
       // Choose repo that is relevant for host
       ServiceOsSpecific.Repo serviceRepo = hostOs.getRepo();
       if (serviceRepo != null) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
index f61e46c..5c0f2aa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
@@ -159,6 +159,17 @@ public interface Host {
    * @return the osType
    */
   public String getOsType();
+  
+  /**
+   * Get the os Family: 
+   * redhat5: for centos5, rhel5, oraclelinux5 ..
+   * redhat6: for centos6, rhel6, oraclelinux6 ..
+   * debian12 : for ubuntu12
+   * suse11: for sles11, suse11 ..
+   * 
+   * @return the osFamily
+   */
+  public String getOsFamily();
 
   /**
    * @param osType the osType to set

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
index 9110e45..39566d9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
@@ -62,6 +62,8 @@ public class ServiceInfo {
   private File metricsFile = null;
   @XmlTransient
   private Map<String, Map<String, List<MetricDefinition>>> metrics = null;
+  
+  private static final String OS_SEPARATOR = ",";
 
 
   /**
@@ -310,7 +312,9 @@ public class ServiceInfo {
                   new TreeMap<String, ServiceOsSpecific>();
           if (serviceOsSpecifics != null) {
             for (ServiceOsSpecific osSpecific : serviceOsSpecifics) {
-              tmpMap.put(osSpecific.getOsType(), osSpecific);
+              for(String osFamily:osSpecific.getOsFamily().split(OS_SEPARATOR)) {
+                tmpMap.put(osFamily.trim(), osSpecific);
+              }
             }
           }
           serviceOsSpecificsMap = tmpMap;

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 f494d4d..aebf9e7 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
@@ -29,7 +29,7 @@ import com.google.gson.annotations.SerializedName;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ServiceOsSpecific {
 
-  private String osType;
+  private String osFamily;
   private Repo repo;
 
 
@@ -38,8 +38,8 @@ public class ServiceOsSpecific {
   private List<Package> packages = new ArrayList<Package>();
 
 
-  public String getOsType() {
-    return osType;
+  public String getOsFamily() {
+    return osFamily;
   }
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
index 64fabf5..7dd4cda 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
@@ -319,7 +319,8 @@ public class ClustersImpl implements Clusters {
     if (repos == null || repos.isEmpty()) {
       return false;
     }
-    return repos.containsKey(h.getOsType());
+    
+    return repos.containsKey(h.getOsFamily());
   }
 
   @Override
@@ -363,7 +364,7 @@ public class ClustersImpl implements Clusters {
                     + ", clusterName=" + clusterName
                     + ", clusterStackId=" + cluster.getDesiredStackVersion().getStackId()
                     + ", hostname=" + hostname
-                    + ", hostOsType=" + host.getOsType();
+                    + ", hostOsFamily=" + host.getOsFamily();
                 LOG.warn(message);
                 throw new AmbariException(message);
               }
@@ -451,7 +452,7 @@ public class ClustersImpl implements Clusters {
             + ", clusterName=" + clusterName
             + ", clusterStackId=" + cluster.getDesiredStackVersion().getStackId()
             + ", hostname=" + hostname
-            + ", hostOsType=" + host.getOsType();
+            + ", hostOsFamily=" + host.getOsFamily();
         LOG.warn(message);
         throw new AmbariException(message);
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 24e3f8f..df97944 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -87,6 +87,7 @@ public class HostImpl implements Host {
   private static final String SWAPSIZE = "swap_size";
   private static final String SWAPFREE = "swap_free";
   private static final String TIMEZONE = "timezone";
+  private static final String OS_RELEASE_VERSION = "os_release_version";
 
   
   private final Gson gson;
@@ -455,6 +456,10 @@ public class HostImpl implements Host {
       if (hostInfo.getTimeZone() != null) {
         attrs.put(TIMEZONE, hostInfo.getTimeZone());
       }
+      if (hostInfo.getOSRelease() != null) {
+        attrs.put(OS_RELEASE_VERSION, hostInfo.getOSRelease());
+      }
+      
       setHostAttributes(attrs);
 
       saveIfPersisted();
@@ -803,6 +808,12 @@ public class HostImpl implements Host {
       writeLock.unlock();
     }
   }
+  
+  @Override
+  public String getOsFamily() {
+	  String majorVersion = this.getHostAttributes().get(OS_RELEASE_VERSION).split("\\.")[0];
+	  return this.getHostAttributes().get(OSFAMILY) + majorVersion;
+  }
 
   @Override
   public List<DiskInfo> getDisksInfo() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
index 8bf9a78..6758389 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl>
-      <repoid>HDP-1.2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos5</baseurl>
-      <repoid>HDP-1.2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl>
-      <repoid>HDP-1.2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos5</baseurl>
-      <repoid>HDP-1.2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl>
@@ -71,17 +43,4 @@
       <mirrorslist></mirrorslist>
     </repo>
   </os>
-    <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl>
-      <repoid>HDP-1.2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl>
-      <repoid>HDP-UTILS-1.1.0.15</repoid>
-      <reponame>HDP-UTILS</reponame>
-      <mirrorslist></mirrorslist>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
index e8f1855..b7932f1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.2.1</baseurl>
-      <repoid>HDP-1.2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.2.1</baseurl>
-      <repoid>HDP-1.2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.2.1</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.2.1</baseurl>
-      <repoid>HDP-1.2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.2.1</baseurl>
-      <repoid>HDP-1.2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl>
-      <repoid>HDP-1.2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
index daad89d..a44462a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/GA/1.3.0.0</baseurl>
-      <repoid>HDP-1.3.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/GA/1.3.0.0</baseurl>
-      <repoid>HDP-1.3.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/GA/1.3.0.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/GA/1.3.0.0</baseurl>
-      <repoid>HDP-1.3.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/GA/1.3.0.0</baseurl>
-      <repoid>HDP-1.3.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/GA/1.3.0.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-    <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/GA/1.3.0.0</baseurl>
-      <repoid>HDP-1.3.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/repos/repoinfo.xml
index 54ff3b6..eace5c0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.2.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-    <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml
index f55fe25..657ee1f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.2.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-    <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.2.0</baseurl>
-      <repoid>HDP-1.3.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 6aa5b42..528db40 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
@@ -50,7 +50,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -83,7 +83,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -96,29 +96,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>sles11</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>apache2</name>
-            </package>
-            <package>
-              <type>rpm</type>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos6</osType>
+          <osFamily>redhat5,redhat6</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 7a7c3d6..21f0de9 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
@@ -96,7 +96,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 d29d2fc..f990385 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
@@ -80,7 +80,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 a1f561e..c35bae9 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
@@ -88,7 +88,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -105,7 +105,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>centos6</osType>
+          <osFamily>redhat5,redhat6</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -114,61 +114,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>redhat6</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>redhat5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux6</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-server</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>suse11</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>mysql-client</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>sles11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -208,7 +154,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 0be704a..74f6c2b 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
@@ -36,7 +36,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -73,7 +73,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -86,38 +86,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>sles11</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php5-json</name>
-            </package>
-            <package>
-              <type>rpm</type>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>redhat5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux5</osType>
+          <osFamily>redhat5</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 c473435..e6cd199 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
@@ -80,7 +80,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 2b66bbf..4121867 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
@@ -36,7 +36,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 426bb25..327c6d8 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
@@ -54,7 +54,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 d6c2a1f..78703e9 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
@@ -67,7 +67,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 07817b1..138affe 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
@@ -48,7 +48,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml
index 6af60d3..bf11e25 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.3.0</baseurl>
-      <repoid>HDP-1.3.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.3.0</baseurl>
-      <repoid>HDP-1.3.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.3.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.3.3.0</baseurl>
-      <repoid>HDP-1.3.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.3.3.0</baseurl>
-      <repoid>HDP-1.3.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.3.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-    <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.3.3.0</baseurl>
-      <repoid>HDP-1.3.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
index d50bf8c..dd920ee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.5.0</baseurl>
-      <repoid>HDP-2.0.5</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.5.0</baseurl>
-      <repoid>HDP-2.0.5</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.5.0</baseurl>
@@ -51,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.5.0</baseurl>
-      <repoid>HDP-2.0.5</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/repos/repoinfo.xml
index dee7e3f..296dcd5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl>
-      <repoid>HDP-2.0.6.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl>
-      <repoid>HDP-2.0.6.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-   <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl>
-      <repoid>HDP-2.0.6.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl>
-      <repoid>HDP-2.0.6.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl>
-      <repoid>HDP-2.0.6.GlusterFS</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
index 0c34907..0aa9248 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.1</baseurl>
-      <repoid>HDP-2.0.6</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.1</baseurl>
-      <repoid>HDP-2.0.6</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.1</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-   <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.1</baseurl>
-      <repoid>HDP-2.0.6</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.1</baseurl>
-      <repoid>HDP-2.0.6</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.1</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.1</baseurl>
-      <repoid>HDP-2.0.6</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 f9a4c11..fe38488 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
@@ -45,7 +45,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -78,7 +78,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -91,65 +91,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>sles11</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>apache2</name>
-            </package>
-            <package>
-              <type>rpm</type>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos6</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>redhat6</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>redhat5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux6</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>httpd</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux5</osType>
+          <osFamily>redhat5,redhat6</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 c29b564..41e79e9 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
@@ -66,7 +66,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 71c2e72..349f810 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
@@ -97,7 +97,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 bf23cad..aa35673 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
@@ -64,7 +64,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -81,7 +81,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>centos6</osType>
+          <osFamily>centos6</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -90,7 +90,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>centos5</osType>
+          <osFamily>centos5</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -99,7 +99,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>redhat6</osType>
+          <osFamily>redhat6</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -108,7 +108,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>redhat5</osType>
+          <osFamily>redhat5</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -117,7 +117,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>oraclelinux6</osType>
+          <osFamily>oraclelinux6</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -126,7 +126,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>oraclelinux5</osType>
+          <osFamily>oraclelinux5</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -135,7 +135,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -144,7 +144,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>sles11</osType>
+          <osFamily>sles11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -183,7 +183,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 3080880..5c13516 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
@@ -35,7 +35,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -72,7 +72,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>suse11</osType>
+          <osFamily>suse11</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -85,38 +85,7 @@
           </packages>
         </osSpecific>
         <osSpecific>
-          <osType>sles11</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php5-json</name>
-            </package>
-            <package>
-              <type>rpm</type>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>centos5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>redhat5</osType>
-          <packages>
-            <package>
-              <type>rpm</type>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osType>oraclelinux5</osType>
+          <osFamily>redhat5</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 f6da775..d6ef639 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
@@ -46,7 +46,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 c163fd4..07fdc6d 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
@@ -35,7 +35,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 ee82f0b..798dde0 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
@@ -37,7 +37,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 9ddcd3c..433b7b6 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
@@ -35,7 +35,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 d9d0492..beb94a0 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
@@ -68,7 +68,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>
@@ -139,7 +139,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 9fac2b3..2d0e626 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
@@ -46,7 +46,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml
index a304cd2..2142f24 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml
@@ -16,20 +16,6 @@
    limitations under the License.
 -->
 <reposinfo>
-  <os type="centos6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
-      <repoid>HDP-2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.10.0</baseurl>
-      <repoid>HDP-2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
@@ -44,20 +30,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-   <os type="oraclelinux6">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.10.0</baseurl>
-      <repoid>HDP-2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.10.0</baseurl>
-      <repoid>HDP-2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.10.0</baseurl>
@@ -65,11 +37,4 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.10.0</baseurl>
-      <repoid>HDP-2.0</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
 </reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
index afb210f..5903ccd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml
@@ -17,20 +17,6 @@
 -->
 <reposinfo>
   <latest>http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json</latest>
-  <os type="centos6">
-    <repo>
-      <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="centos5">
-    <repo>
-      <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="redhat6">
     <repo>
       <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
@@ -45,20 +31,6 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="oraclelinux6">
-    <repo>
-      <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="oraclelinux5">
-    <repo>
-      <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
   <os type="suse11">
     <repo>
       <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
@@ -66,14 +38,7 @@
       <reponame>HDP</reponame>
     </repo>
   </os>
-  <os type="sles11">
-    <repo>
-      <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-  </os>
-  <os type="ubuntu12">
+  <os type="debian12">
     <repo>
       <baseurl>REPLACE_WITH_UBUNTU12_URL</baseurl>
       <repoid>HDP-2.1</repoid>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 962fcf2..1126873 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
@@ -45,7 +45,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 1a60125..860aa6b 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
@@ -38,7 +38,7 @@
       <version>0.12.0.2.1</version>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 3419663..ab6dc7b 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
@@ -26,7 +26,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 90bdd4d..df7d69f 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
@@ -78,7 +78,7 @@
 
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 dd80f87..dd574bf 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
@@ -35,7 +35,7 @@
       </components>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 3170aaa..8f51a93 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
@@ -24,7 +24,7 @@
       <version>0.13.0.2.1</version>
       <osSpecifics>
         <osSpecific>
-          <osType>any</osType>
+          <osFamily>any</osFamily>
           <packages>
             <package>
               <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 2d00903..9a3ea37 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
@@ -40,7 +40,7 @@
 
             <osSpecifics>
                 <osSpecific>
-                    <osType>any</osType>
+                    <osFamily>any</osFamily>
                     <packages>
                         <package>
                             <type>rpm</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index 6014bbf..a1f4886 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -511,6 +511,7 @@ public class TestHeartbeatHandler {
     HostInfo hi = new HostInfo();
     hi.setHostName(DummyHostname1);
     hi.setOS(DummyOsType);
+    
     reg.setHostname(DummyHostname1);
     reg.setHardwareProfile(hi);
     reg.setAgentVersion(""); // Invalid agent version
@@ -1680,6 +1681,13 @@ public class TestHeartbeatHandler {
       throws AmbariException {
     clusters.addHost(DummyHostname1);
     clusters.getHost(DummyHostname1).setOsType(DummyOsType);
+    
+    Map<String, String> hostAttributes = new HashMap<String, String>();
+    hostAttributes.put("os_family", "redhat");
+    hostAttributes.put("os_release_version", "6.3");
+    clusters.getHost(DummyHostname1).setHostAttributes(hostAttributes);
+
+    
     clusters.getHost(DummyHostname1).persist();
     clusters.addCluster(DummyCluster);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index f5c24ea..79d0e7e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.verify;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.ambari.server.AmbariException;
@@ -40,6 +41,7 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigFactory;
+import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.HostState;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
@@ -89,16 +91,24 @@ public class TestHeartbeatMonitor {
   public void teardown() {
     injector.getInstance(PersistService.class).stop();
   }
+  
+  private void setOsFamily(Host host, String osFamily, String osVersion) {
+    Map<String, String> hostAttributes = new HashMap<String, String>();
+    hostAttributes.put("os_family", osFamily);
+    hostAttributes.put("os_release_version", osVersion);
+    
+    host.setHostAttributes(hostAttributes);
+  }
 
   @Test
   public void testStateCommandsGeneration() throws AmbariException, InterruptedException,
           InvalidStateTransitionException {
     Clusters clusters = injector.getInstance(Clusters.class);
     clusters.addHost(hostname1);
-    clusters.getHost(hostname1).setOsType("centos6");
+    setOsFamily(clusters.getHost(hostname1), "redhat", "6.3");
     clusters.getHost(hostname1).persist();
     clusters.addHost(hostname2);
-    clusters.getHost(hostname2).setOsType("centos6");
+    setOsFamily(clusters.getHost(hostname2), "redhat", "6.3");
     clusters.getHost(hostname2).persist();
     clusters.addCluster(clusterName);
     Cluster cluster = clusters.getCluster(clusterName);
@@ -172,10 +182,10 @@ public class TestHeartbeatMonitor {
   public void testStatusCommandForAnyComponents() throws Exception {
     Clusters clusters = injector.getInstance(Clusters.class);
     clusters.addHost(hostname1);
-    clusters.getHost(hostname1).setOsType("centos6");
+    setOsFamily(clusters.getHost(hostname1), "redhat", "6.3");
     clusters.getHost(hostname1).persist();
     clusters.addHost(hostname2);
-    clusters.getHost(hostname2).setOsType("centos6");
+    setOsFamily(clusters.getHost(hostname2), "redhat", "6.3");
     clusters.getHost(hostname2).persist();
     clusters.addCluster(clusterName);
     Cluster cluster = clusters.getCluster(clusterName);
@@ -270,7 +280,7 @@ public class TestHeartbeatMonitor {
           InvalidStateTransitionException {
     Clusters clusters = injector.getInstance(Clusters.class);
     clusters.addHost(hostname1);
-    clusters.getHost(hostname1).setOsType("centos5");
+    setOsFamily(clusters.getHost(hostname1), "redhat", "5.9");
     clusters.getHost(hostname1).persist();
     clusters.addCluster(clusterName);
     Cluster cluster = clusters.getCluster(clusterName);
@@ -373,7 +383,7 @@ public class TestHeartbeatMonitor {
           InvalidStateTransitionException {
     Clusters clusters = injector.getInstance(Clusters.class);
     clusters.addHost(hostname1);
-    clusters.getHost(hostname1).setOsType("centos5");
+    setOsFamily(clusters.getHost(hostname1), "redhat", "6.3");
     clusters.getHost(hostname1).persist();
     
     clusters.addCluster(clusterName);

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 9ff575d..553ea95 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -80,7 +80,7 @@ public class AmbariMetaInfoTest {
   private static final int REPOS_CNT = 3;
   private static final int STACKS_NAMES_CNT = 1;
   private static final int PROPERTIES_CNT = 63;
-  private static final int OS_CNT = 3;
+  private static final int OS_CNT = 4;
 
   private AmbariMetaInfo metaInfo = null;
   private final static Logger LOG =
@@ -234,6 +234,7 @@ public class AmbariMetaInfoTest {
     Set<String> centos5Cnt = new HashSet<String>();
     Set<String> centos6Cnt = new HashSet<String>();
     Set<String> redhat6cnt = new HashSet<String>();
+    Set<String> redhat5cnt = new HashSet<String>();
 
     for (List<RepositoryInfo> vals : repos.values()) {
       for (RepositoryInfo repo : vals) {
@@ -244,8 +245,10 @@ public class AmbariMetaInfoTest {
           centos6Cnt.add(repo.getRepoId());
         } else if (repo.getOsType().equals("redhat6")) {
           redhat6cnt.add(repo.getRepoId());
+        } else if (repo.getOsType().equals("redhat5")) {
+          redhat5cnt.add(repo.getRepoId());
         } else {
-          fail("Found invalid os" + repo.getOsType());
+          fail("Found invalid os " + repo.getOsType());
         }
 
         if (repo.getRepoId().equals("epel")) {
@@ -260,6 +263,7 @@ public class AmbariMetaInfoTest {
 
     assertEquals(3, centos5Cnt.size());
     assertEquals(3, redhat6cnt.size());
+    assertEquals(3, redhat5cnt.size());
     assertEquals(3, centos6Cnt.size());
   }
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/01bd864f/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 930d225..2f17c52 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
@@ -118,7 +118,7 @@ public class StackExtensionHelperTest {
         Map<String,ServiceOsSpecific> specifics = serviceInfo.getOsSpecifics();
         assertTrue(specifics.size() == 2);
         ServiceOsSpecific anyOs = specifics.get(AmbariMetaInfo.ANY_OS);
-        assertEquals(AmbariMetaInfo.ANY_OS, anyOs.getOsType());
+        assertEquals(AmbariMetaInfo.ANY_OS, anyOs.getOsFamily());
         assertEquals("rpm", anyOs.getPackages().get(0).getType());
         assertEquals("wget", anyOs.getPackages().get(0).getName());
 
@@ -129,7 +129,7 @@ public class StackExtensionHelperTest {
                 secondComponent.getCommandScript().getTimeout());
 
         ServiceOsSpecific c6Os = specifics.get("centos6");
-        assertEquals("centos6", c6Os.getOsType());
+        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",


Mime
View raw message