Merge pull request #1025 from edx/release

Release

playbooks/vagrant-devstack.yml

@@ -2,6 +2,16 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    migrate_db: 'yes'
+    openid_workaround: true
+    devstack: true
+    disable_edx_services: true
+    edx_platform_version: 'master'
+    mongo_enable_journal: false
+    EDXAPP_NO_PREREQ_INSTALL: 0
+    COMMON_MOTD_TEMPLATE: 'devstack_motd.tail.j2'
+    COMMON_SSH_PASSWORD_AUTH: "yes"
   vars_files:
     - "group_vars/all"
   roles:

playbooks/vagrant-fullstack.yml

@@ -2,6 +2,14 @@
   hosts: all
   sudo: True
   gather_facts: True
+  vars:
+    migrate_db: 'yes'
+    openid_workaround: true
+    edx_platform_version: 'master'
+    EDXAPP_LMS_NGINX_PORT: '80'
+    EDX_ANSIBLE_DUMP_VARS: true
+    CERTS_DOWNLOAD_URL: 'http://192.168.33.10:18090'
+    CERTS_VERIFY_URL: 'http://192.168.33.10:18090'
   vars_files:
     - "group_vars/all"
   roles:

util/jenkins/ansible-provision.sh

@@ -65,7 +65,7 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-f551419c"
+    ami="ami-97dbc3fe"
   elif [[ $server_type == "ubuntu_12.04" || $server_type == "full_edx_installation_from_scratch" ]]; then
     ami="ami-59a4a230"
   fi

vagrant/base/devstack/Vagrantfile

+Vagrant.require_version ">= 1.5.3"
+
 VAGRANTFILE_API_VERSION = "2"
 
 MEMORY = 2048
@@ -28,6 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 4567, host: 4567
   config.ssh.insert_key = true
 
+  config.vm.synced_folder  ".", "/vagrant", disabled: true
   config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform", :create => true, nfs: true
   config.vm.synced_folder "#{forum_mount_dir}", "/edx/app/forum/cs_comments_service", :create => true, nfs: true
   config.vm.synced_folder "#{ora_mount_dir}", "/edx/app/ora/ora", :create => true, nfs: true
@@ -53,20 +56,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :ansible do |ansible|
     ansible.playbook = "../../../playbooks/vagrant-devstack.yml"
     ansible.verbose = "vvvv"
-    # set extra-vars here instead of in the vagrant play so that
-    # they are written out to /edx/etc/server-vars.yml which can
-    # be used later when running ansible locally
-    ansible.extra_vars = {
-        migrate_db: 'yes',
-        openid_workaround: true,
-        devstack: true,
-        disable_edx_services: true,
-        edx_platform_version: 'master',
-        mongo_enable_journal: false,
-        EDXAPP_NO_PREREQ_INSTALL: 0,
-        COMMON_MOTD_TEMPLATE: 'devstack_motd.tail.j2',
-        COMMON_SSH_PASSWORD_AUTH: "yes",
-    }
 
   end
 end

vagrant/base/fullstack/Vagrantfile

+Vagrant.require_version ">= 1.5.3"
+
 VAGRANTFILE_API_VERSION = "2"
 
 MEMORY = 2048
@@ -31,16 +33,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # set extra-vars here instead of in the vagrant play so that
     # they are written out to /edx/etc/server-vars.yml which can
     # be used later when running ansible locally
-    ansible.extra_vars = { 
-        ansible_ssh_user: 'vagrant',
-        migrate_db: 'yes',
-        openid_workaround: true,
-        edx_platform_version: 'master',
-        EDXAPP_LMS_NGINX_PORT: '80',
-        EDX_ANSIBLE_DUMP_VARS: true,
-        CERTS_DOWNLOAD_URL: 'http://192.168.33.10:18090',
-        CERTS_VERIFY_URL: 'http://192.168.33.10:18090',
-    }
     ansible.verbose = "vvvv"
   end
 end

vagrant/release/devstack/Vagrantfile

+Vagrant.require_version ">= 1.5.3"
+
 VAGRANTFILE_API_VERSION = "2"
 
 MEMORY = 2048
@@ -36,8 +38,9 @@ end
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX devstack VM from an official release
-  config.vm.box     = "himbasha-devstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140325-himbasha-devstack.box"
+  config.vm.box     = "injera-devstack"
+  config.vm.synced_folder  ".", "/vagrant", disabled: true
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140418-injera-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

+Vagrant.require_version ">= 1.5.3"
+
 VAGRANTFILE_API_VERSION = "2"
 
 MEMORY = 2048
@@ -6,8 +8,9 @@ CPU_COUNT = 2
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX fullstack VM from an official release
-  config.vm.box     = "himbasha-fullstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140325-himbasha-fullstack.box"
+  config.vm.box     = "injera-fullstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140418-injera-fullstack.box"
+  config.vm.synced_folder  ".", "/vagrant", disabled: true
   config.ssh.insert_key = true
 
   config.vm.network :private_network, ip: "192.168.33.10"