whirr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1004330 - in /incubator/whirr/trunk: CHANGES.txt services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
Date Mon, 04 Oct 2010 17:31:35 GMT
Author: tomwhite
Date: Mon Oct  4 17:31:34 2010
New Revision: 1004330

URL: http://svn.apache.org/viewvc?rev=1004330&view=rev
Log:
WHIRR-107. Test failing due to not matching Amazon Linux AMI on EC2.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1004330&r1=1004329&r2=1004330&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Oct  4 17:31:34 2010
@@ -39,6 +39,9 @@ Trunk (unreleased changes)
 
     WHIRR-101. Hadoop on EC2 does not use the /mnt partition. (tomwhite)
 
+    WHIRR-107. Test failing due to not matching Amazon Linux AMI on EC2.
+    (tomwhite)
+
 Release 0.1.0 - 2010-09-02
 
   INCOMPATIBLE CHANGES

Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java?rev=1004330&r1=1004329&r2=1004330&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
(original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
Mon Oct  4 17:31:34 2010
@@ -21,6 +21,7 @@ package org.apache.whirr.service.hadoop;
 import org.apache.whirr.service.ClusterSpec;
 import org.apache.whirr.service.jclouds.TemplateBuilderStrategy;
 import org.jclouds.aws.ec2.compute.domain.EC2Hardware;
+import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.compute.domain.TemplateBuilder;
 
 public class HadoopTemplateBuilderStrategy extends TemplateBuilderStrategy {
@@ -29,6 +30,10 @@ public class HadoopTemplateBuilderStrate
       TemplateBuilder templateBuilder) {
     super.configureTemplateBuilder(clusterSpec, templateBuilder);
     
+    if ("ec2".equals(clusterSpec.getProvider()) 
+        && clusterSpec.getImageId() == null) {
+      templateBuilder.osFamily(OsFamily.AMZN_LINUX);
+    }
     if ("ec2".equals(clusterSpec.getProvider())
         && clusterSpec.getHardwareId() == null) {
       // micro is too small for Hadoop (even for testing)



Mime
View raw message