Merge pull request #1596 from edx/fixup-config-version-in-devstack

Fixup config version in vagrant devstack

vagrant/release/devstack/Vagrantfile

@@ -18,18 +18,21 @@ export PYTHONUNBUFFERED=1
 source /edx/app/edx_ansible/venvs/edx_ansible/bin/activate
 cd /edx/app/edx_ansible/edx_ansible/playbooks
 
-# Need to ensure that the configuration repo is updated
-# The vagrant-devstack.yml playbook will also do this, but only
-# after loading the playbooks into memory.  If these are out of date,
-# this can cause problems (e.g. looking for templates that no longer exist).
-/edx/bin/update configuration ${OPENEDX_RELEASE-release}
-
 # Did we specify an openedx release?
 if [ -n "$OPENEDX_RELEASE" ]; then
   EXTRA_VARS="-e OPENEDX_RELEASE=$OPENEDX_RELEASE"
+  CONFIG_VER=$OPENEDX_RELEASE
+else
+  CONFIG_VER="release"
 fi
 
-ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=${OPENEDX_RELEASE-release} $EXTRA_VARS
+# Need to ensure that the configuration repo is updated
+# The vagrant-devstack.yml playbook will also do this, but only
+# after loading the playbooks into memory.  If these are out of date,
+# this can cause problems (e.g. looking for templates that no longer exist).
+/edx/bin/update configuration $CONFIG_VER
+
+ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=$CONFIG_VER $EXTRA_VARS
 SCRIPT
 
 edx_platform_mount_dir = "edx-platform"