Author: abayer
Date: Wed Aug 15 18:44:29 2012
New Revision: 1373561
URL: http://svn.apache.org/viewvc?rev=1373561&view=rev
Log:
WHIRR-612. CDH4 can be installed on Ubuntu now as well as CentOS.
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties
whirr/trunk/services/cdh/pom.xml
whirr/trunk/services/cdh/src/main/resources/functions/configure_cdh_hbase.sh
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Aug 15 18:44:29 2012
@@ -114,7 +114,9 @@ Trunk (unreleased changes)
WHIRR-528. Add a retry loop around apt-get and yum commands to overcome
transient errors (Andrei Savu via adriancole)
BUG FIXES
-
+
+ WHIRR-612. CDH4 can be installed on Ubuntu now as well as CentOS. (abayer)
+
WHIRR-604. Non-resolvable hostnames should be reset to something
resolvable. (abayer)
Modified: whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
--- whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties (original)
+++ whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties Wed Aug 15 18:44:29 2012
@@ -44,13 +44,13 @@ whirr.identity=${env:AWS_ACCESS_KEY_ID}
whirr.credential=${env:AWS_SECRET_ACCESS_KEY}
# The size of the instance to use. See
http://aws.amazon.com/ec2/instance-types/
-whirr.hardware-id=m1.large
+#whirr.hardware-id=m1.large
# Ubuntu 10.04 LTS Lucid. See http://alestic.com/
#whirr.image-id=us-east-1/ami-da0cf8b3
# RightImage CentOS_5.4_x64_v4.4.10
-whirr.image-id=us-east-1/ami-ccb35ea5
+#whirr.image-id=us-east-1/ami-ccb35ea5
# If you choose a different location, make sure whirr.image-id is updated too
-whirr.location-id=us-east-1
+#whirr.location-id=us-east-1
# You can also specify the spot instance price
# http://aws.amazon.com/ec2/spot-instances/
Modified: whirr/trunk/services/cdh/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/pom.xml?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
--- whirr/trunk/services/cdh/pom.xml (original)
+++ whirr/trunk/services/cdh/pom.xml Wed Aug 15 18:44:29 2012
@@ -114,25 +114,25 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.0.0-cdh4.0.0</version>
+ <version>2.0.0-cdh4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>2.0.0-cdh4.0.0</version>
+ <version>2.0.0-cdh4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.92.1-cdh4.0.0</version>
+ <version>0.92.1-cdh4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.3-cdh4.0.0</version>
+ <version>3.4.3-cdh4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -163,7 +163,7 @@
to find version info for other cdh REPO versions, same for
hbase and zookeeper -->
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>2.0.0-mr1-cdh4.0.0</version>
+ <version>2.0.0-mr1-cdh4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -174,6 +174,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <exclude>**/CdhHBaseServiceTest.java</exclude>
<exclude>**/CdhYarnServiceTest.java</exclude>
</testExcludes>
</configuration>
@@ -193,19 +194,19 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>2.0.0-cdh4.0.0</version>
+ <version>2.0.0-cdh4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>2.0.0-cdh4.0.0</version>
+ <version>2.0.0-cdh4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>2.0.0-cdh4.0.0</version>
+ <version>2.0.0-cdh4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -216,6 +217,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <exclude>**/CdhHBaseServiceTest.java</exclude>
<exclude>**/CdhHadoopServiceTest.java</exclude>
</testExcludes>
</configuration>
Modified:
whirr/trunk/services/cdh/src/main/resources/functions/configure_cdh_hbase.sh
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/main/resources/functions/configure_cdh_hbase.sh?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
---
whirr/trunk/services/cdh/src/main/resources/functions/configure_cdh_hbase.sh
(original)
+++
whirr/trunk/services/cdh/src/main/resources/functions/configure_cdh_hbase.sh
Wed Aug 15 18:44:29 2012
@@ -95,7 +95,7 @@ function configure_cdh_hbase() {
# not supported
;;
hbase-thriftserver)
- install_hbase_daemon ${HBASE_PREFIX}hadoop-hbase-thrift
+ install_hbase_daemon ${HBASE_PREFIX}hbase-thrift
;;
esac
done
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
---
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
(original)
+++
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
Wed Aug 15 18:44:29 2012
@@ -28,8 +28,3 @@ whirr.hadoop.install-function=install_cd
whirr.hadoop.configure-function=configure_cdh_hadoop
whirr.env.REPO=cdh4
-# CDH4b1 only has RPMs available (not debs) so use Centos
-whirr.hardware-id=m1.large
-# RightImage CentOS_5.4_x64_v4.4.10
-whirr.image-id=us-east-1/ami-ccb35ea5
-whirr.location-id=us-east-1
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
---
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
(original)
+++
whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
Wed Aug 15 18:44:29 2012
@@ -30,14 +30,8 @@ whirr.yarn.configure-function=configure_
whirr.yarn.start-function=start_cdh_yarn
whirr.mr_jobhistory.start-function=start_cdh_mr_jobhistory
whirr.env.REPO=cdh4
-whirr.env.mapreduce_version=2
+whirr.env.MAPREDUCE_VERSION=2
hadoop-mapreduce.mapreduce.framework.name=yarn
hadoop-common.ipc.client.connect.max.retries=100
-# CDH4b1 only has RPMs available (not debs) so use Centos
-whirr.hardware-id=m1.large
-# RightImage CentOS_5.4_x64_v4.4.10
-whirr.image-id=us-east-1/ami-ccb35ea5
-whirr.location-id=us-east-1
-
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
(original)
+++ whirr/trunk/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
Wed Aug 15 18:44:29 2012
@@ -37,8 +37,3 @@ whirr.hbase.configure-function=configure
whirr.zookeeper.install-function=install_cdh_zookeeper
whirr.zookeeper.configure-function=configure_cdh_zookeeper
-# CDH4b1 only has RPMs available (not debs) so use Centos
-whirr.hardware-id=m1.large
-# RightImage CentOS_5.4_x64_v4.4.10
-whirr.image-id=us-east-1/ami-ccb35ea5
-whirr.location-id=us-east-1
\ No newline at end of file
Modified:
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties?rev=1373561&r1=1373560&r2=1373561&view=diff
==============================================================================
---
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties
(original)
+++
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties
Wed Aug 15 18:44:29 2012
@@ -27,9 +27,4 @@ whirr.env.REPO=cdh4
whirr.zookeeper.install-function=install_cdh_zookeeper
whirr.zookeeper.configure-function=configure_cdh_zookeeper
-# CDH4b1 only has RPMs available (not debs) so use Centos
-whirr.hardware-id=m1.large
-# RightImage CentOS_5.4_x64_v4.4.10
-whirr.image-id=us-east-1/ami-ccb35ea5
-whirr.location-id=us-east-1
