Преглед изворни кода

AMBARI-10232. Remove Centos5 from Repository Options (aonishuk)

Andrew Onishuk пре 10 година
родитељ
комит
080b182601

+ 0 - 1
ambari-common/src/main/python/ambari_commons/resources/os_family.json

@@ -17,7 +17,6 @@
       "centos linux"
     ],
     "versions": [
-      5,
       6,
       7
     ]

+ 1 - 2
ambari-server/src/main/java/org/apache/ambari/server/state/Host.java

@@ -155,7 +155,7 @@ public interface Host {
   public void setOsInfo(String osInfo);
 
   /**
-   * Get the OS Type: RHEL5/RHEL6/CentOS5/...
+   * Get the OS Type: RHEL6/CentOS6/...
    * Defined and match-able OS type
    * @return the osType
    */
@@ -163,7 +163,6 @@ public interface Host {
   
   /**
    * Get the os Family: 
-   * redhat5: for centos5, rhel5, oraclelinux5 ..
    * redhat6: for centos6, rhel6, oraclelinux6 ..
    * ubuntu12 : for ubuntu12
    * suse11: for sles11, suse11 ..

+ 6 - 6
ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java

@@ -68,17 +68,17 @@ public class RepositoryVersionHelper {
    *    {
    *       "repositories":[
    *          {
-   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0",
+   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0",
    *             "Repositories/repo_name":"HDP-UTILS",
    *             "Repositories/repo_id":"HDP-UTILS-1.1.0.20"
    *          },
    *          {
-   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0",
+   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0",
    *             "Repositories/repo_name":"HDP",
    *             "Repositories/repo_id":"HDP-2.2"
    *          }
    *       ],
-   *       "OperatingSystems/os_type":"redhat5"
+   *       "OperatingSystems/os_type":"redhat6"
    *    }
    * ]
    * </pre>
@@ -112,17 +112,17 @@ public class RepositoryVersionHelper {
    *    {
    *       "repositories":[
    *          {
-   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0",
+   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0",
    *             "Repositories/repo_name":"HDP-UTILS",
    *             "Repositories/repo_id":"HDP-UTILS-1.1.0.20"
    *          },
    *          {
-   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0",
+   *             "Repositories/base_url":"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0",
    *             "Repositories/repo_name":"HDP",
    *             "Repositories/repo_id":"HDP-2.2"
    *          }
    *       ],
-   *       "OperatingSystems/os_type":"redhat5"
+   *       "OperatingSystems/os_type":"redhat6"
    *    }
    * ]
    * </pre>

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

@@ -28,18 +28,6 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
-  <os family="redhat5">
-    <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>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.17</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
   <os family="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.1</baseurl>

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

@@ -29,18 +29,6 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
-  <os family="redhat5">
-    <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>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.17</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
   <os family="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.10.0</baseurl>

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

@@ -29,18 +29,6 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
-  <os family="redhat5">
-    <repo>
-      <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
-      <repoid>HDP-2.1</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.19/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.19</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
   <os family="suse11">
     <repo>
       <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>

+ 0 - 12
ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml

@@ -29,18 +29,6 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
-  <os family="redhat5">
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/GA/2.2.0.0</baseurl>
-      <repoid>HDP-2.2</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
   <os family="suse11">
     <repo>
       <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/GA/2.2.0.0</baseurl>

+ 0 - 12
ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml

@@ -29,18 +29,6 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
-  <os family="redhat5">
-    <repo>
-      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.3.0.0</baseurl>
-      <repoid>HDP-2.3</repoid>
-      <reponame>HDP</reponame>
-    </repo>
-    <repo>
-      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos5</baseurl>
-      <repoid>HDP-UTILS-1.1.0.20</repoid>
-      <reponame>HDP-UTILS</reponame>
-    </repo>
-  </os>
   <os family="suse11">
     <repo>
       <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.3.0.0</baseurl>