job_flow.rb in elasticity-2.3.1

- old
+ new

@@ -19,12 +19,11 @@
     attr_accessor :ec2_subnet_id
     attr_accessor :placement
 
     def initialize(access, secret)
       @action_on_failure = 'TERMINATE_JOB_FLOW'
-      @ec2_key_name = 'default'
-      @hadoop_version = '0.20.205'
+      @hadoop_version = '1.0.3'
       @name = 'Elasticity Job Flow'
       @ami_version = 'latest'
       @keep_job_flow_alive_when_no_steps = false
       @placement = 'us-east-1a'
 
@@ -142,15 +141,15 @@
       preamble = {
         :name => @name,
         :ami_version => @ami_version,
         :instances => {
           :keep_job_flow_alive_when_no_steps => @keep_job_flow_alive_when_no_steps,
-          :ec2_key_name => @ec2_key_name,
           :hadoop_version => @hadoop_version,
           :instance_groups => jobflow_instance_groups
         }
       }
       preamble.merge!(:ec2_subnet_id => @ec2_subnet_id) if @ec2_subnet_id
+      preamble[:instances].merge!(:ec2_key_name => @ec2_key_name) if @ec2_key_name
       preamble
     end
 
     def jobflow_steps
       steps = []
\ No newline at end of file