Author: abayer
Date: Fri Aug 17 20:59:18 2012
New Revision: 1374436
URL: http://svn.apache.org/viewvc?rev=1374436&view=rev
Log:
WHIRR-632. CDH4 only available on 64 bit.
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties
whirr/trunk/recipes/hbase-cdh.properties
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=1374436&r1=1374435&r2=1374436&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Fri Aug 17 20:59:18 2012
@@ -119,6 +119,8 @@ Trunk (unreleased changes)
BUG FIXES
+ WHIRR-632. CDH4 only available on 64 bit. (abayer)
+
WHIRR-612. CDH4 can be installed on Ubuntu now as well as CentOS. (abayer)
WHIRR-604. Non-resolvable hostnames should be reset to something
Modified: whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties?rev=1374436&r1=1374435&r2=1374436&view=diff
==============================================================================
--- whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties (original)
+++ whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties Fri Aug 17 20:59:18 2012
@@ -44,6 +44,9 @@ whirr.provider=aws-ec2
whirr.identity=${env:AWS_ACCESS_KEY_ID}
whirr.credential=${env:AWS_SECRET_ACCESS_KEY}
+# 64 bit required, and either Ubuntu 10.04 or CentOS/RHEL 5.x.
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
+
# The size of the instance to use. See
http://aws.amazon.com/ec2/instance-types/
#whirr.hardware-id=m1.large
# Ubuntu 10.04 LTS Lucid. See http://alestic.com/
Modified: whirr/trunk/recipes/hbase-cdh.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/recipes/hbase-cdh.properties?rev=1374436&r1=1374435&r2=1374436&view=diff
==============================================================================
--- whirr/trunk/recipes/hbase-cdh.properties (original)
+++ whirr/trunk/recipes/hbase-cdh.properties Fri Aug 17 20:59:18 2012
@@ -45,6 +45,9 @@ whirr.hbase.configure-function=configure
# Customise instance types & AMI for Amazon EC2
#
+# 64 bit required, and either Ubuntu 10.04 or CentOS/RHEL 5.x
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
+
# Use a specific instance type. See http://aws.amazon.com/ec2/instance-types/
# whirr.hardware-id=c1.xlarge
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=1374436&r1=1374435&r2=1374436&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
Fri Aug 17 20:59:18 2012
@@ -18,6 +18,7 @@
whirr.cluster-name=hadoop-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,1
hadoop-datanode+hadoop-tasktracker
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
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=1374436&r1=1374435&r2=1374436&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
Fri Aug 17 20:59:18 2012
@@ -18,6 +18,7 @@
whirr.cluster-name=hadoop-mr2-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1
hadoop-namenode+yarn-resourcemanager+mapreduce-historyserver,1
hadoop-datanode+yarn-nodemanager
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
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=1374436&r1=1374435&r2=1374436&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
Fri Aug 17 20:59:18 2012
@@ -19,6 +19,7 @@ whirr.cluster-name=hbase-cdh-itest-${sys
whirr.instance-templates=1
hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver,1
hadoop-datanode+hadoop-tasktracker+hbase-regionserver
whirr.hardware-min-ram=2048
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
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=1374436&r1=1374435&r2=1374436&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
Fri Aug 17 20:59:18 2012
@@ -17,6 +17,7 @@
#
whirr.cluster-name=zookeeper-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 zookeeper
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
