Revert "Fix OpenStack requirements installation to happen automatically when the…

Revert "Fix OpenStack requirements installation to happen automatically when the correct variable is passed"

This reverts commit 73d7c004.

playbooks/roles/edxapp/meta/main.yml

@@ -8,5 +8,3 @@ dependencies:
     theme_users:
       - "{{ edxapp_user }}"
     when: "{{ EDXAPP_ENABLE_COMPREHENSIVE_THEMING }}"
-  - role: openstack
-    when: "{{ EDXAPP_USE_SWIFT_STORAGE }}"

playbooks/roles/openstack/tasks/main.yml

@@ -50,8 +50,17 @@
     dest: "{{ COMMON_OBJECT_STORE_LOG_SYNC_SCRIPT }}"
   when: COMMON_OBJECT_STORE_LOG_SYNC
 
-# We want to ensure that OpenStack requirements are installed at the same time as edxapp
-# requirements so that they're available during the initial migration.
-- name: make sure Openstack Python requirements get installed
-  set_fact:
-    edxapp_requirements_files: "{{ edxapp_requirements_files + [openstack_requirements_file] }}"
+# Install openstack python requirements into {{ edxapp_venv_dir }}
+- name : Install python requirements
+  # Need to use command rather than pip so that we can maintain the context of our current working directory;
+  # some requirements are pathed relative to the edx-platform repo.
+  # Using the pip from inside the virtual environment implicitly installs everything into that virtual environment.
+  command: >
+    {{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ openstack_requirements_file }}
+    chdir={{ edxapp_code_dir }}
+  sudo_user: "{{ edxapp_user }}"
+  environment: "{{ edxapp_environment }}"
+  when: edxapp_code_dir is defined
+  tags:
+    - install
+    - install:app-requirements