Revert "AMBARI-5459 Usability: Improve Stack Definition support for repositories (dsen)"

This reverts commit 7a251ae7e887b4ec4714d4d0484e12598b4ca32f.

ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml

@@ -22,11 +22,6 @@
       <repoid>HDP-1.3.2</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="redhat5">
     <repo>
@@ -34,11 +29,6 @@
       <repoid>HDP-1.3.2</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="suse11">
     <repo>
@@ -46,10 +36,5 @@
       <repoid>HDP-1.3.2</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/suse11</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
 </reposinfo>

ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml

@@ -22,11 +22,6 @@
       <repoid>HDP-1.3.3</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="redhat5">
     <repo>
@@ -34,11 +29,6 @@
       <repoid>HDP-1.3.3</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="suse11">
     <repo>
@@ -46,10 +36,5 @@
       <repoid>HDP-1.3.3</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/suse11</baseurl>
-      <repoid>HDP-UTILS-2.1-16</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
 </reposinfo>

ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml

@@ -22,11 +22,6 @@
       <repoid>HDP-2.0.6</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="redhat5">
     <repo>
@@ -34,22 +29,12 @@
       <repoid>HDP-2.0.6</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="suse11">
     <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>
-        <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl>
-        <repoid>HDP-UTILS-2.1</repoid>
-        <reponame>HDP-UTILS</reponame>
-      </repo>
     </repo>
   </os>
 </reposinfo>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml

@@ -49,31 +49,31 @@
           <packages>
             <package>
               <type>rpm</type>
-              <name>libganglia</name>
+              <name>libganglia-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>ganglia-devel</name>
+              <name>ganglia-devel-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>ganglia-gmetad</name>
+              <name>ganglia-gmetad-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>ganglia-web</name>
+              <name>ganglia-web-3.5.7-99.noarch</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>python-rrdtool</name>
+              <name>python-rrdtool.x86_64</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>ganglia-gmond</name>
+              <name>ganglia-gmond-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>ganglia-gmond-modules-python</name>
+              <name>ganglia-gmond-modules-python-3.5.0-99</name>
             </package>
           </packages>
         </osSpecific>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml

@@ -47,19 +47,19 @@
             </package>
             <package>
               <type>rpm</type>
-              <name>nagios-plugins</name>
+              <name>nagios-plugins-1.4.9</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>nagios</name>
+              <name>nagios-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>nagios-www</name>
+              <name>nagios-www-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>
-              <name>nagios-devel</name>
+              <name>nagios-devel-3.5.0-99</name>
             </package>
             <package>
               <type>rpm</type>

ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml

@@ -22,11 +22,6 @@
       <repoid>HDP-2.0</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="redhat5">
     <repo>
@@ -34,11 +29,6 @@
       <repoid>HDP-2.0</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="suse11">
     <repo>
@@ -46,10 +36,5 @@
       <repoid>HDP-2.0</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
 </reposinfo>

ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml

@@ -23,11 +23,6 @@
       <repoid>HDP-2.1</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="redhat5">
     <repo>
@@ -35,11 +30,6 @@
       <repoid>HDP-2.1</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="suse11">
     <repo>
@@ -47,11 +37,6 @@
       <repoid>HDP-2.1</repoid>
       <reponame>HDP</reponame>
     </repo>
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl>
-      <repoid>HDP-UTILS-2.1</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
   </os>
   <os type="debian12">
     <repo>