Merge pull request #3269 from edx/feanil/dont_bin_update_devstack

Don't install `/edx/bin/update` on devstacks.

playbooks/roles/edx_ansible/tasks/deploy.yml

@@ -22,7 +22,29 @@
     - install
     - install:app-requirements
 
-- name: Create update and show-repo-heads script
+- name: Create update script
+  template:
+    dest: "{{ edx_ansible_app_dir}}/update"
+    src: "update.j2"
+    owner: "{{ edx_ansible_user }}"
+    group: "{{ edx_ansible_user }}"
+    mode: "0755"
+  when: devstack is not defined or not devstack
+  tags:
+    - install
+    - install:configuration
+
+- name: Create symlinks for update script
+  file:
+    src: "{{ edx_ansible_app_dir }}/update"
+    dest: "{{ COMMON_BIN_DIR }}/update"
+    state: link
+  when: devstack is not defined or not devstack
+  tags:
+    - install
+    - install:configuration
+
+- name: Create utility scripts
   template:
     dest: "{{ edx_ansible_app_dir}}/{{ item.dest }}"
     src: "{{ item.src }}"
@@ -30,19 +52,17 @@
     group: "{{ edx_ansible_user }}"
     mode: "0755"
   with_items:
-    - { src: 'update.j2', dest: 'update' }
     - { src: 'show-repo-heads.j2', dest: 'show-repo-heads' }
   tags:
     - install
     - install:configuration
 
-- name: Create symlinks for update and show-repo-heads scripts
+- name: Create symlinks for utility scripts
   file:
     src: "{{ edx_ansible_app_dir }}/{{ item }}"
     dest: "{{ COMMON_BIN_DIR }}/{{ item }}"
     state: link
   with_items:
-    - update
     - show-repo-heads
   tags:
     - install

vagrant/release/devstack/Vagrantfile

@@ -26,11 +26,6 @@ if [ -n "$OPENEDX_RELEASE" ]; then
     -e xqueue_version=$OPENEDX_RELEASE \
   "
   CONFIG_VER=$OPENEDX_RELEASE
-  # 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
 else
   CONFIG_VER="master"
 fi