You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/03/27 15:40:12 UTC
ambari git commit: AMBARI-10232. Remove Centos5 from Repository
Options (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4c348dfb0 -> 080b18260
AMBARI-10232. Remove Centos5 from Repository Options (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/080b1826
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/080b1826
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/080b1826
Branch: refs/heads/trunk
Commit: 080b1826013f5b0e27b5570e97874fcab507a4fc
Parents: 4c348df
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Mar 27 16:40:04 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Mar 27 16:40:04 2015 +0200
----------------------------------------------------------------------
.../main/python/ambari_commons/resources/os_family.json | 1 -
.../main/java/org/apache/ambari/server/state/Host.java | 3 +--
.../state/stack/upgrade/RepositoryVersionHelper.java | 12 ++++++------
.../main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml | 12 ------------
.../main/resources/stacks/HDP/2.0/repos/repoinfo.xml | 12 ------------
.../main/resources/stacks/HDP/2.1/repos/repoinfo.xml | 12 ------------
.../main/resources/stacks/HDP/2.2/repos/repoinfo.xml | 12 ------------
.../main/resources/stacks/HDP/2.3/repos/repoinfo.xml | 12 ------------
8 files changed, 7 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/ambari-common/src/main/python/ambari_commons/resources/os_family.json
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/ambari_commons/resources/os_family.json b/ambari-common/src/main/python/ambari_commons/resources/os_family.json
index 7402226..2e484c6 100644
--- a/ambari-common/src/main/python/ambari_commons/resources/os_family.json
+++ b/ambari-common/src/main/python/ambari_commons/resources/os_family.json
@@ -17,7 +17,6 @@
"centos linux"
],
"versions": [
- 5,
6,
7
]
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/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 216e3d1..896a4fe 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
@@ -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 ..
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
index a7d3c3d..2e17cf4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java
+++ b/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/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 e803cbd..9855074 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/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 8b217de..a5d8a51 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/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 0c13199..a4d1bf7 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
index c1b4421..6e46bba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
+++ b/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/080b1826/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
index 646b2c0..20c0ea3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
+++ b/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>