Merge pull request #1607 from edx/fix-openedx-release-vars

OPENEDX_RELEASE doesn't work properly with variable inheritance in ansible

playbooks/vagrant-devstack.yml

@@ -12,12 +12,6 @@
     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:

vagrant/base/devstack/Vagrantfile

@@ -107,7 +107,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ansible.extra_vars['ENABLE_LEGACY_ORA'] = true
     end
     if ENV['OPENEDX_RELEASE']
-      ansible.extra_vars['OPENEDX_RELEASE'] = ENV['OPENEDX_RELEASE']
+      ansible.extra_vars = {
+        edx_platform_version: ENV['OPENEDX_RELEASE'],
+        ora2_version: ENV['OPENEDX_RELEASE'],
+        certs_version: ENV['OPENEDX_RELEASE'],
+        forum_version: ENV['OPENEDX_RELEASE'],
+        xqueue_version: ENV['OPENEDX_RELEASE'],
+      }
     end
   end
 end

vagrant/base/fullstack/Vagrantfile

@@ -44,7 +44,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # they are written out to /edx/etc/server-vars.yml which can
     # be used later when running ansible locally
     if ENV['OPENEDX_RELEASE']
-      ansible.extra_vars = { OPENEDX_RELEASE: ENV['OPENEDX_RELEASE']}
+      ansible.extra_vars = {
+        edx_platform_version: ENV['OPENEDX_RELEASE'],
+        ora2_version: ENV['OPENEDX_RELEASE'],
+        certs_version: ENV['OPENEDX_RELEASE'],
+        forum_version: ENV['OPENEDX_RELEASE'],
+        xqueue_version: ENV['OPENEDX_RELEASE'],
+      }
     end
   end
 end

vagrant/release/devstack/Vagrantfile

@@ -20,7 +20,12 @@ cd /edx/app/edx_ansible/edx_ansible/playbooks
 
 # Did we specify an openedx release?
 if [ -n "$OPENEDX_RELEASE" ]; then
-  EXTRA_VARS="-e OPENEDX_RELEASE=$OPENEDX_RELEASE"
+  EXTRA_VARS="-e edx_platform_version=$OPENEDX_RELEASE \
+    -e ora2_version=$OPENEDX_RELEASE \
+    -e certs_version=$OPENEDX_RELEASE \
+    -e forum_version=$OPENEDX_RELEASE \
+    -e xqueue_version=$OPENEDX_RELEASE \
+  "
   CONFIG_VER=$OPENEDX_RELEASE
 else
   CONFIG_VER="release"