terminating sandbox on shutdown

playbooks/edx-east/edx_provision.yml

@@ -18,6 +18,7 @@
       owner: temp
     root_ebs_size: 50
     dns_name: temp
+    instance_initiated_shutdown_behavior: stop
     dns_zone: sandbox.edx.org
     name_tag: sandbox-temp
     elb: false
@@ -33,6 +34,7 @@
     - role: launch_ec2
       keypair: "{{ keypair }}"
       instance_type: "{{ instance_type }}"
+      instance_initiated_shutdown_behavior: "{{ instance_initiated_shutdown_behavior }}"
       security_group: "{{ security_group }}"
       ami: "{{ ami }}"
       region: "{{ region }}"

playbooks/roles/launch_ec2/tasks/main.yml

@@ -40,6 +40,7 @@
     keypair: "{{ keypair }}"
     group: "{{ security_group }}"
     instance_type: "{{ instance_type }}"
+    instance_initiated_shutdown_behavior: "{{ instance_initiated_shutdown_behavior }}"
     image: "{{ ami }}"
     vpc_subnet_id: "{{ vpc_subnet_id }}"
     assign_public_ip: yes

util/jenkins/ansible-provision.sh

@@ -137,6 +137,10 @@ if [[ -z $instance_type ]]; then
   instance_type="t2.large"
 fi
 
+if [[ -z $instance_initiated_shutdown_behavior ]]; then
+  instance_initiated_shutdown_behavior="terminate"
+fi
+
 if [[ -z $enable_newrelic ]]; then
   enable_newrelic="false"
 fi
@@ -311,6 +315,7 @@ security_group: $security_group
 ami: $ami
 region: $region
 zone: $zone
+instance_initiated_shutdown_behavior: $instance_initiated_shutdown_behavior
 instance_tags:
     environment: $environment
     github_username: $github_username