Permalink
Browse files

Fix some references to keypair_file that should have been key_pair_file

  • Loading branch information...
1 parent 1470f6f commit da8e3d56132b7d4bf761f1b18a739344a6fdd01b James Kebinger committed May 9, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/wukong/script/emr_command.rb
@@ -14,7 +14,7 @@
Settings.define :alive, :description => 'Whether to keep machine running after job invocation', :type => :boolean
#
Settings.define :key_pair_file, :description => 'AWS Key pair file', :type => :filename
-Settings.define :key_pair, :description => "AWS Key pair name. If not specified, it's taken from keypair_file's basename", :finally => lambda{ Settings.key_pair ||= File.basename(Settings.key_pair_file.to_s, '.pem') if Settings.key_pair_file }
+Settings.define :key_pair, :description => "AWS Key pair name. If not specified, it's taken from key_pair_file's basename", :finally => lambda{ Settings.key_pair ||= File.basename(Settings.key_pair_file.to_s, '.pem') if Settings.key_pair_file }
Settings.define :instance_type, :description => 'AWS instance type to use', :default => 'm1.small'
Settings.define :master_instance_type, :description => 'Overrides the instance type for the master node', :finally => lambda{ Settings.master_instance_type ||= Settings.instance_type }
Settings.define :jobflow, :description => "ID of an existing EMR job flow. Wukong will create a new job flow"
@@ -59,7 +59,7 @@ def execute_emr_runner
command_args << "--create --name=#{job_name}"
command_args << Settings.dashed_flag_for(:alive)
command_args << Settings.dashed_flags(:num_instances, [:instance_type, :slave_instance_type], :master_instance_type, :hadoop_version).join(' ')
- command_args << Settings.dashed_flags(:availability_zone, :key_pair, :keypair_file).join(' ')
+ command_args << Settings.dashed_flags(:availability_zone, :key_pair, :key_pair_file).join(' ')
command_args << "--bootstrap-action=#{bootstrap_s3_uri}"
end
command_args << Settings.dashed_flags(:enable_debugging, :step_action, [:emr_runner_verbose, :verbose], [:emr_runner_debug, :debug]).join(' ')

0 comments on commit da8e3d5

Please sign in to comment.