You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/03/29 19:29:50 UTC
svn commit: r1462578 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp/manifests/
ambari-server/src/main/java/org/apache/ambari/server/api/services/
ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/
ambari-server/src/main...
Author: swagle
Date: Fri Mar 29 18:29:50 2013
New Revision: 1462578
URL: http://svn.apache.org/r1462578
Log:
AMBARI-1751. Ambari oracle-linux as a supported OS type. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.2/repos/repoinfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/repos/repoinfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.2/repos/repoinfo.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Mar 29 18:29:50 2013
@@ -12,6 +12,8 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-1751. Ambari oracle-linux as a supported OS type. (swagle)
+
AMBARI-1728. Cleanup INFO Logging at the ambari agent to make it more useful
and less verbose. (swagle)
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Fri Mar 29 18:29:50 2013
@@ -74,6 +74,12 @@ class hdp::params()
/^6\..+$/: { $hdp_os_type = "redhat6" }
}
}
+ oraclelinux: {
+ case $::operatingsystemrelease {
+ /^5\..+$/: { $hdp_os_type = "oraclelinux5" }
+ /^6\..+$/: { $hdp_os_type = "oraclelinux6" }
+ }
+ }
suse: {
$hdp_os_type = "suse"
}
@@ -332,7 +338,9 @@ class hdp::params()
'centos6' => 'rrdtool-devel.i686',
'centos5' => 'rrdtool-devel.i386',
'redhat6' => 'rrdtool-devel.i686',
- 'redhat5' => 'rrdtool-devel.i386'
+ 'redhat5' => 'rrdtool-devel.i386',
+ 'oraclelinux6' => 'rrdtool-devel.i686',
+ 'oraclelinux5' => 'rrdtool-devel.i386'
}
},
# The 32bit version of package rrdtool is removed on centos 5/6 to prevent conflict ( BUG-2408)
@@ -342,7 +350,9 @@ class hdp::params()
'centos6' => 'rrdtool.i686',
'centos5' => 'rrdtool.i386',
'redhat6' => 'rrdtool.i686',
- 'redhat5' => 'rrdtool.i386'
+ 'redhat5' => 'rrdtool.i386',
+ 'oraclelinux6' => 'rrdtool.i686',
+ 'oraclelinux5' => 'rrdtool.i386'
}
},
ambari-log4j => {
@@ -550,8 +560,10 @@ class hdp::params()
suse => 'php5-json',
centos6 => $NOTHING,
redhat6 => $NOTHING,
+ oraclelinux6 => $NOTHING,
centos5 => 'php-pecl-json.x86_64',
- redhat5 => 'php-pecl-json.x86_64'}
+ redhat5 => 'php-pecl-json.x86_64',
+ oraclelinux5 => 'php-pecl-json.x86_64'}
},
ganglia-server => {
@@ -581,7 +593,9 @@ class hdp::params()
'centos6' => 'rrdtool-devel.i686',
'centos5' => 'rrdtool-devel.i386',
'redhat6' => 'rrdtool-devel.i686',
- 'redhat5' => 'rrdtool-devel.i386'
+ 'redhat5' => 'rrdtool-devel.i386',
+ 'oraclelinux6' => 'rrdtool-devel.i686',
+ 'oraclelinux5' => 'rrdtool-devel.i386'
}
},
@@ -592,7 +606,9 @@ class hdp::params()
'centos6' => 'rrdtool.i686',
'centos5' => 'rrdtool.i386',
'redhat6' => 'rrdtool.i686',
- 'redhat5' => 'rrdtool.i386'
+ 'redhat5' => 'rrdtool.i386',
+ 'oraclelinux6' => 'rrdtool.i686',
+ 'oraclelinux5' => 'rrdtool.i386'
}
},
@@ -616,7 +632,9 @@ class hdp::params()
centos5 => '/etc/yum.repos.d',
suse => '/etc/zypp/repos.d',
redhat6 => '/etc/yum.repos.d',
- redhat5 => '/etc/yum.repos.d'
+ redhat5 => '/etc/yum.repos.d',
+ oraclelinux6 => '/etc/yum.repos.d',
+ oraclelinux5 => '/etc/yum.repos.d'
}
$rrd_py_path =
@@ -625,7 +643,9 @@ class hdp::params()
centos6 => '/var/www/cgi-bin',
centos5 => '/var/www/cgi-bin',
redhat6 => '/var/www/cgi-bin',
- redhat5 => '/var/www/cgi-bin'
+ redhat5 => '/var/www/cgi-bin',
+ oraclelinux6 => '/var/www/cgi-bin',
+ oraclelinux5 => '/var/www/cgi-bin'
}
$nagios_lookup_daemon_strs =
@@ -634,7 +654,9 @@ class hdp::params()
centos6 => '/usr/bin/nagios',
centos5 => '/usr/bin/nagios',
redhat6 => '/usr/bin/nagios',
- redhat5 => '/usr/bin/nagios'
+ redhat5 => '/usr/bin/nagios',
+ oraclelinux6 => '/usr/bin/nagios',
+ oraclelinux5 => '/usr/bin/nagios'
}
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java Fri Mar 29 18:29:50 2013
@@ -920,14 +920,16 @@ public class AmbariMetaInfo {
if (type1.equals(type2)) {
return true;
}
- if (type1.equals("redhat5") || type1.equals("centos5")) {
- if (type2.equals("centos5")
- || type2.equals("redhat5")) {
+ if (type1.equals("redhat5") || type1.equals("centos5") ||
+ type1.equals("oraclelinux5")) {
+ if (type2.equals("centos5") || type2.equals("redhat5") ||
+ type2.equals("oraclelinux5")) {
return true;
}
- } else if (type1.equals("redhat6") || type1.equals("centos6")) {
- if (type2.equals("centos6")
- || type2.equals("redhat6")) {
+ } else if (type1.equals("redhat6") || type1.equals("centos6") ||
+ type1.equals("oraclelinux6")) {
+ if (type2.equals("centos6") || type2.equals("redhat6") ||
+ type2.equals("oraclelinux6")) {
return true;
}
}
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/repos/repoinfo.xml Fri Mar 29 18:29:50 2013
@@ -68,6 +68,32 @@
<mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
</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>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist>
+ </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>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
<os type="suse11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.2/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.2/repos/repoinfo.xml?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.2/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.2/repos/repoinfo.xml Fri Mar 29 18:29:50 2013
@@ -68,6 +68,32 @@
<mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
</repo>
</os>
+ <os type="oraclelinux6">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/centos6</baseurl>
+ <repoid>HDP-1.2.2</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
+ <os type="oraclelinux5">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/centos5</baseurl>
+ <repoid>HDP-1.2.2</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
<os type="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/suse11</baseurl>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml Fri Mar 29 18:29:50 2013
@@ -68,6 +68,32 @@
<mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
</repo>
</os>
+ <os type="oraclelinux6">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos6</baseurl>
+ <repoid>HDP-1.3.0</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
+ <os type="oraclelinux5">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos5</baseurl>
+ <repoid>HDP-1.3.0</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
<os type="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/suse11</baseurl>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/repos/repoinfo.xml?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/repos/repoinfo.xml Fri Mar 29 18:29:50 2013
@@ -68,6 +68,32 @@
<mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
</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>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist>
+ </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>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
<os type="suse11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.2/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.2/repos/repoinfo.xml?rev=1462578&r1=1462577&r2=1462578&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.2/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.2/repos/repoinfo.xml Fri Mar 29 18:29:50 2013
@@ -68,6 +68,32 @@
<mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
</repo>
</os>
+ <os type="oraclelinux6">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/centos6</baseurl>
+ <repoid>HDP-1.2.2</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
+ <os type="oraclelinux5">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/centos5</baseurl>
+ <repoid>HDP-1.2.2</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl></baseurl>
+ <repoid>HDP-epel</repoid>
+ <reponame>HDP-epel</reponame>
+ <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist>
+ </repo>
+ </os>
<os type="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.2.2/repos/suse11</baseurl>