Merge pull request #895 from edx/feanil/fix_ci

Fix devstack and CI breakage.

playbooks/roles/discern/tasks/deploy.yml

@@ -9,7 +9,7 @@
 
 - name: enable supervisor scripts - discern, discern_celery
   file: >
-    dest={{ supervisor_available_dir }}/{{ item }}.conf
+    src={{ supervisor_available_dir }}/{{ item }}.conf
     dest={{ supervisor_cfg_dir }}/{{ item }}.conf
     owner={{ supervisor_user }}
     state=link

playbooks/roles/supervisor/tasks/main.yml

@@ -105,7 +105,7 @@
 # on instance startup.
 - name: create pre_supervisor upstart job
   template: >
-    src=etc/initpre_supervisor.conf.j2 dest=/etc/init/pre_supervisor.conf
+    src=etc/init/pre_supervisor.conf.j2 dest=/etc/init/pre_supervisor.conf
     owner=root group=root
   when: supervisor_service == "supervisor" and disable_edx_services and not devstack
 

vagrant/release/devstack/Vagrantfile

@@ -16,9 +16,9 @@ cd /edx/app/edx_ansible/edx_ansible/playbooks
 # 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 master
+/edx/bin/update configuration release
 
-ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy
+ansible-playbook -i localhost, -c local vagrant-devstack.yml --tags=deploy -e configuration_version=release
 SCRIPT
 
 edx_platform_mount_dir = "edx-platform"