Merge pull request #728 from edx/jarv/focaccia

Jarv/focaccia

playbooks/edx-east/edx_provision.yml

@@ -2,18 +2,37 @@
   hosts: localhost
   connection: local
   gather_facts: False
-  pre_tasks:
+  vars:
+    keypair: continuous-integration
+    instance_type: m1.medium
+    security_group: sandbox
+    # ubuntu 12.04
+    ami: ami-d0f89fb9
+    region: us-east-1
+    zone: us-east-1b
+    instance_tags:
+      environment: sandbox
+      github_username: temp
+      Name: sandbox-temp
+      source: provisioning-script
+      owner: temp
+    root_ebs_size: 50
+    dns_name: temp
+    dns_zone: m.sandbox.edx.org
+    name_tag: sandbox-temp
+    elb: false
   roles:
     - role: launch_ec2
       keypair: "{{ keypair }}"
       instance_type: "{{ instance_type }}"
       security_group: "{{ security_group }}"
-      ami_image: "{{ ami }}"
+      ami: "{{ ami }}"
       region: "{{ region }}"
       instance_tags: "{{ instance_tags }}"
       root_ebs_size: "{{ root_ebs_size }}"
       dns_name: "{{ dns_name }}"
       dns_zone: "{{ dns_zone }}"
+      zone: "{{ zone }}"
       terminate_instance: true
       instance_profile_name: sandbox
 
@@ -21,6 +40,8 @@
   hosts: launched
   sudo: True
   gather_facts: False
+  vars:
+    elb: false
   pre_tasks:
     - name: Wait for cloud-init to finish
       wait_for: >

playbooks/vagrant-devstack.yml

@@ -22,3 +22,4 @@
     - ora
     - browsers
     - local_dev
+    - demo

util/jenkins/ansible-provision.sh

@@ -54,7 +54,7 @@ fi
 extra_vars="/var/tmp/extra-vars-$$.yml"
 
 if [[ -z $region ]]; then
-  region="us-east1"
+  region="us-east-1"
 fi
 
 if [[ -z $zone ]]; then
@@ -75,7 +75,7 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-73f2c51a"
+    ami="ami-0dd1ef64"
   elif [[ $server_type == "ubuntu_12.04" ]]; then
     ami="ami-d0f89fb9"
   fi

vagrant/release/devstack/Vagrantfile

@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
 
   # Creates an edX devstack VM from an official release
   config.vm.box     = "empanada-devstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20131219-empanada-devstack.box"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140130-focaccia-devstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.vm.network :forwarded_port, guest: 8000, host: 8000

vagrant/release/fullstack/Vagrantfile

@@ -5,7 +5,7 @@ Vagrant.configure("2") do |config|
 
   # Creates an edX fullstack VM from an official release
   config.vm.box     = "empanada"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20131218-empanada-fullstack.box"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140130-focaccia-fullstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.hostsupdater.aliases = ["preview.localhost"]