Merge pull request #2192 from edx/e0d/fix-edx-ansible

E0d/fix edx ansible

playbooks/roles/edx_ansible/defaults/main.yml

@@ -39,6 +39,10 @@ edx_ansible_venv_bin: "{{ edx_ansible_venv_dir }}/bin"
 edx_ansible_user: "edx-ansible"
 edx_ansible_source_repo: https://github.com/edx/configuration.git
 edx_ansible_requirements_file: "{{ edx_ansible_code_dir }}/requirements.txt"
+edx_ansible_requirements_files:
+  - "{{ edx_ansible_code_dir }}/pre-requirements.txt"
+  - "{{ edx_ansible_code_dir }}/requirements.txt"
+
 # edX configuration repo
 configuration_version: release
 edx_ansible_var_file: "{{ edx_ansible_app_dir }}/server-vars.yml"

playbooks/roles/edx_ansible/tasks/deploy.yml

@@ -10,6 +10,7 @@
     requirements="{{ edx_ansible_requirements_file }}" virtualenv="{{ edx_ansible_venv_dir }}" state=present
     extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ edx_ansible_user }}"
+  with_items: "{{ edx_ansible_requirements_files }}"
 
 - name: create update script
   template: >

vagrant/base/devstack/Vagrantfile

@@ -112,6 +112,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     if ENV['OPENEDX_RELEASE']
       ansible.extra_vars = {
         edx_platform_version: ENV['OPENEDX_RELEASE'],
+        configuration_version: ENV['OPENEDX_RELEASE'],
         certs_version: ENV['OPENEDX_RELEASE'],
         forum_version: ENV['OPENEDX_RELEASE'],
         xqueue_version: ENV['OPENEDX_RELEASE'],