svn commit: r1186365 - in /whirr/trunk: CHANGES.txt core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java

[asavu]

Author: asavu
Date: Wed Oct 19 17:44:09 2011
New Revision: 1186365

URL: http://svn.apache.org/viewvc?rev=1186365&view=rev
Log:
WHIRR-397. Automatic template selection is too restrictive (asavu)

Modified:
    whirr/trunk/CHANGES.txt
    
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java

Modified: whirr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1186365&r1=1186364&r2=1186365&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Oct 19 17:44:09 2011
@@ -42,6 +42,8 @@ Trunk (unreleased changes)
 
     WHIRR-401. Use regular instances for testing on aws-ec2 (asavu)
 
+    WHIRR-397. Automatic template selection is too restrictive (asavu) 
+
   BUG FIXES
 
     WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)

Modified: 
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java?rev=1186365&r1=1186364&r2=1186365&view=diff
==============================================================================
--- 
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
 (original)
+++ 
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TemplateBuilderStrategy.java
 Wed Oct 19 17:44:09 2011
@@ -33,19 +33,20 @@ public class TemplateBuilderStrategy {
     if (clusterSpec.getImageId() != null) {
       templateBuilder.imageId(clusterSpec.getImageId());
     } else {
-      templateBuilder.os64Bit(true);
       templateBuilder.osFamily(OsFamily.UBUNTU);
       templateBuilder.osVersionMatches("10.04");
 
       // canonical images, but not testing ones
       if ("aws-ec2".equals(clusterSpec.getProvider()))
-        templateBuilder.imageDescriptionMatches("/ubuntu-images/");
+        templateBuilder.imageDescriptionMatches("ubuntu-images/");
     }
     
     if (clusterSpec.getHardwareId() != null) {
       templateBuilder.hardwareId(clusterSpec.getHardwareId());
+
     } else if(clusterSpec.getHardwareMinRam() != 0) {
       templateBuilder.minRam(clusterSpec.getHardwareMinRam());
+
     } else {
       templateBuilder.minRam(1024);
     }