@@ -314,7 +314,6 @@ def parse_args():
314314 "--instance-profile-name" , default = None ,
315315 help = "IAM profile name to launch instances under" )
316316
317-
318317 (opts , args ) = parser .parse_args ()
319318 if len (args ) != 2 :
320319 parser .print_help ()
@@ -656,18 +655,19 @@ def launch_cluster(conn, opts, cluster_name):
656655 for zone in zones :
657656 num_slaves_this_zone = get_partition (opts .slaves , num_zones , i )
658657 if num_slaves_this_zone > 0 :
659- slave_res = image .run (key_name = opts .key_pair ,
660- security_group_ids = [slave_group .id ] + additional_group_ids ,
661- instance_type = opts .instance_type ,
662- placement = zone ,
663- min_count = num_slaves_this_zone ,
664- max_count = num_slaves_this_zone ,
665- block_device_map = block_map ,
666- subnet_id = opts .subnet_id ,
667- placement_group = opts .placement_group ,
668- user_data = user_data_content ,
669- instance_initiated_shutdown_behavior = opts .instance_initiated_shutdown_behavior ,
670- instance_profile_name = opts .instance_profile_name )
658+ slave_res = image .run (
659+ key_name = opts .key_pair ,
660+ security_group_ids = [slave_group .id ] + additional_group_ids ,
661+ instance_type = opts .instance_type ,
662+ placement = zone ,
663+ min_count = num_slaves_this_zone ,
664+ max_count = num_slaves_this_zone ,
665+ block_device_map = block_map ,
666+ subnet_id = opts .subnet_id ,
667+ placement_group = opts .placement_group ,
668+ user_data = user_data_content ,
669+ instance_initiated_shutdown_behavior = opts .instance_initiated_shutdown_behavior ,
670+ instance_profile_name = opts .instance_profile_name )
671671 slave_nodes += slave_res .instances
672672 print ("Launched {s} slave{plural_s} in {z}, regid = {r}" .format (
673673 s = num_slaves_this_zone ,
@@ -689,18 +689,19 @@ def launch_cluster(conn, opts, cluster_name):
689689 master_type = opts .instance_type
690690 if opts .zone == 'all' :
691691 opts .zone = random .choice (conn .get_all_zones ()).name
692- master_res = image .run (key_name = opts .key_pair ,
693- security_group_ids = [master_group .id ] + additional_group_ids ,
694- instance_type = master_type ,
695- placement = opts .zone ,
696- min_count = 1 ,
697- max_count = 1 ,
698- block_device_map = block_map ,
699- subnet_id = opts .subnet_id ,
700- placement_group = opts .placement_group ,
701- user_data = user_data_content ,
702- instance_initiated_shutdown_behavior = opts .instance_initiated_shutdown_behavior ,
703- instance_profile_name = opts .instance_profile_name )
692+ master_res = image .run (
693+ key_name = opts .key_pair ,
694+ security_group_ids = [master_group .id ] + additional_group_ids ,
695+ instance_type = master_type ,
696+ placement = opts .zone ,
697+ min_count = 1 ,
698+ max_count = 1 ,
699+ block_device_map = block_map ,
700+ subnet_id = opts .subnet_id ,
701+ placement_group = opts .placement_group ,
702+ user_data = user_data_content ,
703+ instance_initiated_shutdown_behavior = opts .instance_initiated_shutdown_behavior ,
704+ instance_profile_name = opts .instance_profile_name )
704705
705706 master_nodes = master_res .instances
706707 print ("Launched master in %s, regid = %s" % (zone , master_res .id ))
0 commit comments