add option for instance initiated shutdown

Author: nchammas

ec2/spark_ec2.py

@@ -306,6 +306,9 @@ def parse_args():
         "--private-ips", action="store_true", default=False,
         help="Use private IPs for instances rather than public if VPC/subnet " +
              "requires that.")
+    parser.add_option(
+        "--instance-initiated-shutdown-behavior", default="stop",
+        choices=["stop", "terminate"])
 
     (opts, args) = parser.parse_args()
     if len(args) != 2:
@@ -656,7 +659,8 @@ def launch_cluster(conn, opts, cluster_name):
                                       block_device_map=block_map,
                                       subnet_id=opts.subnet_id,
                                       placement_group=opts.placement_group,
-                                      user_data=user_data_content)
+                                      user_data=user_data_content,
+                                      instance_initiated_shutdown_behavior=opts.instance_initiated_shutdown_behavior)
                 slave_nodes += slave_res.instances
                 print("Launched {s} slave{plural_s} in {z}, regid = {r}".format(
                       s=num_slaves_this_zone,
@@ -687,7 +691,8 @@ def launch_cluster(conn, opts, cluster_name):
                                block_device_map=block_map,
                                subnet_id=opts.subnet_id,
                                placement_group=opts.placement_group,
-                               user_data=user_data_content)
+                               user_data=user_data_content,
+                               instance_initiated_shutdown_behavior=opts.instance_initiated_shutdown_behavior)
 
         master_nodes = master_res.instances
         print("Launched master in %s, regid = %s" % (zone, master_res.id))