Author: abayer
Date: Tue Aug 21 13:17:34 2012
New Revision: 1375526
URL: http://svn.apache.org/viewvc?rev=1375526&view=rev
Log:
WHIRR-640. Ensure minRam is set for CDH recipes and test properties
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=1375526&r1=1375525&r2=1375526&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Tue Aug 21 13:17:34 2012
@@ -123,6 +123,9 @@ Release 0.8.0 - 2012-08-17
BUG FIXES
+ WHIRR-640. Ensure minRam is set for CDH recipes and test
+ properties. (abayer)
+
WHIRR-639. Set ownership of CDH Hadoop data dir to Hadoop group. (abayer)
WHIRR-632. CDH4 only available on 64 bit. (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=1375526&r1=1375525&r2=1375526&view=diff
==============================================================================
--- whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties (original)
+++ whirr/trunk/recipes/hadoop-yarn-cdh-ec2.properties Tue Aug 21 13:17:34 2012
@@ -45,7 +45,7 @@ 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
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
# The size of the instance to use. See
http://aws.amazon.com/ec2/instance-types/
#whirr.hardware-id=m1.large
Modified: whirr/trunk/recipes/hbase-cdh.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/recipes/hbase-cdh.properties?rev=1375526&r1=1375525&r2=1375526&view=diff
==============================================================================
--- whirr/trunk/recipes/hbase-cdh.properties (original)
+++ whirr/trunk/recipes/hbase-cdh.properties Tue Aug 21 13:17:34 2012
@@ -46,7 +46,7 @@ whirr.hbase.configure-function=configure
#
# 64 bit required, and either Ubuntu 10.04 or CentOS/RHEL 5.x
-whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
# 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=1375526&r1=1375525&r2=1375526&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
Tue Aug 21 13:17:34 2012
@@ -18,7 +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.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
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=1375526&r1=1375525&r2=1375526&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
Tue Aug 21 13:17:34 2012
@@ -18,7 +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.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
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=1375526&r1=1375525&r2=1375526&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
Tue Aug 21 13:17:34 2012
@@ -18,8 +18,7 @@
whirr.cluster-name=hbase-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
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.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
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=1375526&r1=1375525&r2=1375526&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
Tue Aug 21 13:17:34 2012
@@ -17,7 +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.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
