Merge pull request #1538 from edx/vagrant-aspen

Added vagrant-aspen playbook and vagrant conf

playbooks/roles/forum/defaults/main.yml

@@ -29,7 +29,7 @@ FORUM_ELASTICSEARCH_URL: "http://{{ FORUM_ELASTICSEARCH_HOST }}:{{ FORUM_ELASTIC
 
 # This needs to be a string, set to 'false' to disable
 FORUM_NEW_RELIC_ENABLE: '{{ COMMON_ENABLE_NEWRELIC }}'
-FORUM_NEW_RELIC_LICENSE_KEY: "{{ NEWRELIC_LICENSE_KEY }}"
+FORUM_NEW_RELIC_LICENSE_KEY: '{{ NEWRELIC_LICENSE_KEY | default("") }}'
 FORUM_NEW_RELIC_APP_NAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-forum"
 
 FORUM_WORKER_PROCESSES: "4"
@@ -72,4 +72,3 @@ forum_version: "master"
 #
 forum_services:
   - {service: "elasticsearch", host: "{{ FORUM_ELASTICSEARCH_HOST }}", port: "{{ FORUM_ELASTICSEARCH_PORT }}"}
-

playbooks/vagrant-devstack.yml

@@ -7,12 +7,17 @@
     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"
     ENABLE_LEGACY_ORA: !!null
+    # used for releases
+    edx_platform_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    ora2_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    certs_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    forum_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    xqueue_version: '{{ OPENEDX_RELEASE | default("master") }}'
   vars_files:
     - "group_vars/all"
   roles:

playbooks/vagrant-fullstack.yml

@@ -5,11 +5,16 @@
   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'
+    # used for releases
+    edx_platform_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    ora2_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    certs_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    forum_version: '{{ OPENEDX_RELEASE | default("master") }}'
+    xqueue_version: '{{ OPENEDX_RELEASE | default("master") }}'
   vars_files:
     - "group_vars/all"
   roles:

vagrant/base/devstack/Vagrantfile

@@ -102,8 +102,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ansible.playbook = "../../../playbooks/vagrant-devstack.yml"
     ansible.verbose = "vvvv"
 
+    ansible.extra_vars = {}
     if ENV['ENABLE_LEGACY_ORA']
-        ansible.extra_vars = { ENABLE_LEGACY_ORA: true }
+      ansible.extra_vars['ENABLE_LEGACY_ORA'] = true
+    end
+    if ENV['OPENEDX_RELEASE']
+      ansible.extra_vars['OPENEDX_RELEASE'] = ENV['OPENEDX_RELEASE']
     end
   end
 end

vagrant/base/fullstack/Vagrantfile

@@ -39,9 +39,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :ansible do |ansible|
     # point Vagrant at the location of your playbook you want to run
     ansible.playbook = "../../../playbooks/vagrant-fullstack.yml"
+    ansible.verbose = "vvv"
     # 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.verbose = "vvvv"
+    if ENV['OPENEDX_RELEASE']
+      ansible.extra_vars = { OPENEDX_RELEASE: ENV['OPENEDX_RELEASE']}
+    end
   end
 end

vagrant/release/devstack/Vagrantfile

@@ -23,7 +23,12 @@ cd /edx/app/edx_ansible/edx_ansible/playbooks
 # this can cause problems (e.g. looking for templates that no longer exist).
 /edx/bin/update configuration release
 
-ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=release
+# Did we specify an openedx release?
+if [ -n "$1" ]; then
+  EXTRA_VARS="-e OPENEDX_RELEASE=$1"
+fi
+
+ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=release $EXTRA_VARS
 SCRIPT
 
 edx_platform_mount_dir = "edx-platform"
@@ -105,5 +110,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Assume that the base box has the edx_ansible role installed
   # We can then tell the Vagrant instance to update itself.
-  config.vm.provision "shell", inline: $script
+  config.vm.provision "shell", inline: $script, args: ENV['OPENEDX_RELEASE']
 end