Merge pull request #121 from edx/jarv/termination-support

This adds termination support to the ec2 module

playbooks/edx_sandbox.yml

 - name: Create sandbox instance
   hosts: localhost
   connection: local
-  user: root
-  sudo: False
   gather_facts: False
-
   vars:
     keypair: continuous-integration
-    instance_type: m1.large
+    instance_type: m1.small
     security_group: sandbox
     image: ami-d0f89fb9
     region: us-east-1
-
   roles:
     - launch_instance
 
@@ -24,6 +20,7 @@
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
     - "{{ secure_dir }}/vars/edxapp_sandbox.yml"
+
   roles:
     - common
     - nginx

playbooks/edx-east/edx_sandbox.yml → playbooks/edx_sandbox_jenkins.yml

 - name: Create sandbox instance
   hosts: localhost
   connection: local
-  user: root
-  sudo: False
   gather_facts: False
-
   vars:
     keypair: continuous-integration
-    instance_type: m1.large
+    instance_type: m1.small
     security_group: sandbox
     image: ami-d0f89fb9
     region: us-east-1
-
   roles:
     - launch_instance
 
@@ -21,11 +17,24 @@
   gather_facts: True
   vars:
     migrate_db: True
+    ansible_ssh_private_key_file: /var/lib/jenkins/continuous-integration.pem
   vars_files:
+    - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
     - "{{ secure_dir }}/vars/edxapp_sandbox.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
     - nginx
     - edxlocal
     - edxapp
+    - xqueue
+    - xserver
+
+- name: Terminate instances
+  hosts: localhost
+  connection: local
+  tasks:
+    - name: Terminate instances that were previously launched
+      local_action: 
+        module: ec2 
+        state: 'absent'
+        instance_ids: ${ec2.instance_ids}