You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by ab...@apache.org on 2012/08/21 15:19:47 UTC

svn commit: r1375529 - in /whirr/branches/branch-0.8: ./ recipes/ services/cdh/src/test/resources/

Author: abayer
Date: Tue Aug 21 13:19:46 2012
New Revision: 1375529

URL: http://svn.apache.org/viewvc?rev=1375529&view=rev
Log:
WHIRR-640. Ensure minRam is set for CDH recipes and test properties

Modified:
    whirr/branches/branch-0.8/CHANGES.txt
    whirr/branches/branch-0.8/recipes/hadoop-yarn-cdh-ec2.properties
    whirr/branches/branch-0.8/recipes/hbase-cdh.properties
    whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
    whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
    whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
    whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties

Modified: whirr/branches/branch-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/CHANGES.txt?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/CHANGES.txt (original)
+++ whirr/branches/branch-0.8/CHANGES.txt Tue Aug 21 13:19:46 2012
@@ -121,6 +121,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/branches/branch-0.8/recipes/hadoop-yarn-cdh-ec2.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/recipes/hadoop-yarn-cdh-ec2.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/recipes/hadoop-yarn-cdh-ec2.properties (original)
+++ whirr/branches/branch-0.8/recipes/hadoop-yarn-cdh-ec2.properties Tue Aug 21 13:19:46 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/branches/branch-0.8/recipes/hbase-cdh.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/recipes/hbase-cdh.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/recipes/hbase-cdh.properties (original)
+++ whirr/branches/branch-0.8/recipes/hbase-cdh.properties Tue Aug 21 13:19:46 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/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties (original)
+++ whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-cdh-test.properties Tue Aug 21 13:19:46 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/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties (original)
+++ whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hadoop-mr2-cdh-test.properties Tue Aug 21 13:19:46 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/branches/branch-0.8/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties (original)
+++ whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-hbase-cdh-test.properties Tue Aug 21 13:19:46 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/branches/branch-0.8/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties?rev=1375529&r1=1375528&r2=1375529&view=diff
==============================================================================
--- whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties (original)
+++ whirr/branches/branch-0.8/services/cdh/src/test/resources/whirr-zookeeper-cdh-test.properties Tue Aug 21 13:19:46 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}