updating edx_sandbox, creating edx_sandbox_jenkins.yml

playbooks/edx_sandbox.yml

@@ -4,20 +4,12 @@
   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
-  tasks:
-    - name: Launch instance 
-      local_action: ec2 keypair=$keypair group=$security_group instance_type=$instance_type image=$image wait=true region=$region count=2
-      register: ec2
-    - name: Add new instance to host group
-      local_action: add_host hostname=${item.public_ip} groupname=launched 
-      with_items: ${ec2.instances}
-    - name: Wait for SSH to come up
-      local_action: wait_for host=${item.public_dns_name} port=22 delay=60 timeout=320 state=started
-      with_items: ${ec2.instances}
+  roles:
+    - launch_instance
 
 - name: Configure instance(s)
   hosts: launched
@@ -28,9 +20,12 @@
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
     - "{{ secure_dir }}/vars/edxapp_sandbox.yml"
-  tasks:
-    command: true
 
+  roles:
+    - common
+    - nginx
+    - edxlocal
+    - edxapp
 
 - name: Terminate instances
   hosts: localhost

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
 
@@ -22,10 +18,21 @@
   vars:
     migrate_db: True
   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
+    
+
+- name: Terminate instances
+  hosts: localhost
+  connection: local
+  tasks:
+    - name: Terminate instances that were previously launched
+      local_action: 
+        module: ec2 
+        termination_list: ${ec2.instances}
+#      with_items: ${ec2.instances}