You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/07/10 00:41:18 UTC
svn commit: r1359435 - in /incubator/ambari/branches/branch-0.9: CHANGES.txt
docs/pom.xml docs/src/site/apt/install.apt
hmc/puppet/modules/hdp/manifests/lzo/package.pp
hmc/puppet/modules/hdp/manifests/params.pp
Author: vikram
Date: Mon Jul 9 22:41:18 2012
New Revision: 1359435
URL: http://svn.apache.org/viewvc?rev=1359435&view=rev
Log:
AMBARI-600. Fix lzo installs to work correctly on RHEL6. AMBARI-601. Ambari docs need updating for the release version for rpms (Contributed by hitesh)
Modified:
incubator/ambari/branches/branch-0.9/CHANGES.txt
incubator/ambari/branches/branch-0.9/docs/pom.xml
incubator/ambari/branches/branch-0.9/docs/src/site/apt/install.apt
incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/lzo/package.pp
incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/CHANGES.txt?rev=1359435&r1=1359434&r2=1359435&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-0.9/CHANGES.txt Mon Jul 9 22:41:18 2012
@@ -6,6 +6,11 @@ characters wide.
Release 0.9.0 - unreleased
+ AMBARI-601. Ambari docs need updating for the release version for rpms
+(hitesh via vikram)
+
+ AMBARI-600. Fix lzo installs to work correctly on RHEL6 (hitesh via vikram)
+
AMBARI-495. HMC master node not shown in topology and node assignments
if the HMC server is not assigned to any other role (yusaku)
Modified: incubator/ambari/branches/branch-0.9/docs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/docs/pom.xml?rev=1359435&r1=1359434&r2=1359435&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/docs/pom.xml (original)
+++ incubator/ambari/branches/branch-0.9/docs/pom.xml Mon Jul 9 22:41:18 2012
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
@@ -42,7 +42,7 @@
<package.pid.dir>/var/run/ambari</package.pid.dir>
<package.release>1</package.release>
<package.type>tar.gz</package.type>
- <ambari.version>1.0.0-SNAPSHOT</ambari.version>
+ <ambari.version>0.9.0-SNAPSHOT</ambari.version>
<final.name>${project.artifactId}-${ambari.version}</final.name>
</properties>
Modified: incubator/ambari/branches/branch-0.9/docs/src/site/apt/install.apt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/docs/src/site/apt/install.apt?rev=1359435&r1=1359434&r2=1359435&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/docs/src/site/apt/install.apt (original)
+++ incubator/ambari/branches/branch-0.9/docs/src/site/apt/install.apt Mon Jul 9 22:41:18 2012
@@ -32,9 +32,9 @@ $ ./create_dashboard_rpm.sh
When this succeeds, you will find following RPMs inside the ambari directory:
- 1) hmc/package/rpm/build/rpmbuild/RPMS/noarch/ambari-1.0.0-1.noarch.rpm
+ 1) hmc/package/rpm/build/rpmbuild/RPMS/noarch/ambari-0.9.0-1.noarch.rpm
- 2) hmc/package/rpm/build/rpmbuild/RPMS/noarch/ambari-agent-1.0.0-1.noarch.rpm
+ 2) hmc/package/rpm/build/rpmbuild/RPMS/noarch/ambari-agent-0.9.0-1.noarch.rpm
3) mon_dashboard/package/rpm/build/rpmbuild/RPMS/noarch/hdp_mon_dashboard-0.0.1-2.noarch.rpm
@@ -50,10 +50,17 @@ Steps to run before you use Ambari to in
* Save the corresponding SSH private key file locally. You will be prompted by Ambari UI to upload it during cluster installation.
- 2) Install ambari-agent-1.0.0-1.noarch.rpm on each of the cluster nodes by running:
+ 2) Install ambari-agent-0.9.0-1.noarch.rpm on each of the cluster nodes by running:
+--
-$ sudo rpm -Uvh ambari-agent-1.0.0-1.noarch.rpm
+$ sudo rpm -Uvh ambari-agent-0.9.0-1.noarch.rpm ( or use yum install to pull in required dependencies )
++--
+
+ * To install ambari-agent, you may need to install puppet beforehand or point to the freely accessible HDP repo
+as it contains the required dependencies to allow the ambari-agent rpm to install successfully. To install the HDP repo, run:
+
++--
+$ sudo rpm -Uvh http://public-repo-1.hortonworks.com/HDP-1.0.13/repos/centos5/hdp-release-1.0.13-1.el5.noarch.rpm
+--
3) Stop iptables on the Ambari master:
@@ -87,11 +94,9 @@ How to install Ambari
+--
$ sudo rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
-OR
-$ sudo rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-
$ sudo rpm -Uvh http://passenger.stealthymonkeys.com/rhel/5/passenger-release.noarch.rpm
$ sudo rpm -Uvh http://public-repo-1.hortonworks.com/HDP-1.0.13/repos/centos5/hdp-release-1.0.13-1.el5.noarch.rpm
+
+--
To install necessary PHP modules on Ambari master:
@@ -121,7 +126,7 @@ $ sudo yum install ruby-devel
To install Ambari on Ambari master:
+--
-$ sudo rpm -iv ambari-1.0.0-1.noarch.rpm
+$ sudo rpm -iv ambari-0.9.0-1.noarch.rpm
$ sudo rpm -iv hdp_mon_dashboard-0.0.1-2.noarch.rpm
+--
@@ -169,4 +174,4 @@ $ ./create_nagios_addon_rpm.sh
* mon_dashboard/package/rpm/build/rpmbuild/RPMS/noarch/hdp_mon_ganglia_addons-0.0.1-2.noarch.rpm
* mon_dashboard/package/rpm/build/rpmbuild/RPMS/noarch/hdp_mon_nagios_addons-0.0.1-2.noarch.rpm
-
\ No newline at end of file
+
Modified: incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/lzo/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/lzo/package.pp?rev=1359435&r1=1359434&r2=1359435&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/lzo/package.pp (original)
+++ incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/lzo/package.pp Mon Jul 9 22:41:18 2012
@@ -21,8 +21,18 @@
define hdp::lzo::package()
{
$size = $name
+
+ case $hdp::params::hdp_os_type {
+ centos6, rhel6: {
+ $pkg_type = 'lzo-rhel6'
+ }
+ default: {
+ $pkg_type = 'lzo-rhel5'
+ }
+ }
+
hdp::package {"lzo ${size}":
- package_type => 'lzo',
+ package_type => "${pkg_type}",
size => $size,
java_needed => false
}
Modified: incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/params.pp?rev=1359435&r1=1359434&r2=1359435&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/manifests/params.pp Mon Jul 9 22:41:18 2012
@@ -246,10 +246,14 @@ class hdp::params()
oozie-server => {
64 => 'oozie.noarch'
},
- lzo => {
+ lzo-rhel5 => {
32 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386'],
64 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386']
},
+ lzo-rhel6 => {
+ 32 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686'],
+ 64 => ['lzo','lzo.i686','lzo-devel','lzo-devel.i686']
+ },
#TODO: make these two consistent on whether case of 64/32 bits
snappy => {
32 => ['snappy','snappy-devel'],