svn commit: r1188582 - /incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java

[ma...@apache.org]

Author: marrs
Date: Tue Oct 25 09:21:52 2011
New Revision: 1188582

URL: http://svn.apache.org/viewvc?rev=1188582&view=rev
Log:
ACE-188 applied the patch

Modified:
    incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java

Modified: incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java?rev=1188582&r1=1188581&r2=1188582&view=diff
==============================================================================
--- incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java (original)
+++ incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java Tue Oct 25 09:21:52 2011
@@ -114,6 +114,8 @@ public class AmazonNodeLauncher implemen
      */
     public static final String RUN_AS_ROOT = "runAsRoot";
 
+    public static final String HARDWARE_ID = "hardwareId";
+
     /**
      * Default set of ports to open on a node.
      */
@@ -122,6 +124,7 @@ public class AmazonNodeLauncher implemen
     private URL m_server;
     private String m_amiId; 
     private String m_location;
+    private String m_hardwareId;
     private String m_accessKeyId;
     private String m_secretAccessKey;
     private String m_tagPrefix;
@@ -131,6 +134,7 @@ public class AmazonNodeLauncher implemen
     private String m_extraPorts;
     private boolean m_runAsRoot;
 
+
     private ComputeServiceContext m_computeServiceContext;
     
     public void start() {
@@ -143,7 +147,7 @@ public class AmazonNodeLauncher implemen
         ComputeService computeService = m_computeServiceContext.getComputeService();
         Template template = computeService.templateBuilder()
                 .imageId(m_location + "/" + m_amiId)
-                .hardwareId(InstanceType.C1_MEDIUM)
+                .hardwareId(m_hardwareId)
                 .locationId(m_location)
                 .build();
         
@@ -236,6 +240,7 @@ public class AmazonNodeLauncher implemen
             }
             String amiId = getConfigProperty(properties, AMI_ID);
             String location = getConfigProperty(properties, LOCATION);
+            String hardwareId = getConfigProperty(properties, HARDWARE_ID, InstanceType.C1_MEDIUM);
             String accessKeyId = getConfigProperty(properties, ACCESS_KEY_ID);
             String secretAccessKey = getConfigProperty(properties, SECRET_ACCESS_KEY);
 
@@ -249,6 +254,7 @@ public class AmazonNodeLauncher implemen
             m_server = server;
             m_amiId = amiId;
             m_location = location;
+            m_hardwareId = hardwareId;
             m_accessKeyId = accessKeyId;
             m_secretAccessKey = secretAccessKey;
             m_tagPrefix = tagPrefix;