Merge pull request #2814 from edx/renzo/optional-credentials-requirements

Install optional credentials requirements

playbooks/roles/credentials/defaults/main.yml

@@ -214,6 +214,11 @@ credentials_gunicorn_timeout: 300
 
 credentials_log_dir: "{{ COMMON_LOG_DIR }}/{{ credentials_service_name }}"
 
+credentials_requirements_base: "{{ credentials_code_dir }}/requirements"
+credentials_requirements:
+  - production.txt
+  - optional.txt
+
 #
 # OS packages
 #

playbooks/roles/credentials/tasks/main.yml

@@ -30,25 +30,14 @@
     - install
     - install:configuration
 
-- name: build virtualenv
-  command: "virtualenv {{ credentials_venv_dir }}"
-  args:
-    creates: "{{ credentials_venv_dir }}/bin/pip"
-  sudo_user: "{{ credentials_user }}"
-  environment: "{{ credentials_environment }}"
-  tags:
-    - install
-    - install:app-requirements
-
 - name: install application requirements
-  command: make prod-requirements
-  args:
-    chdir: "{{ credentials_code_dir }}"
+  pip:
+    requirements: "{{ credentials_requirements_base }}/{{ item }}"
+    # Ansible will initialize this virtualenv if it's missing.
+    virtualenv: "{{ credentials_venv_dir }}"
+    state: present
   sudo_user: "{{ credentials_user }}"
-  environment: "{{ credentials_environment }}"
-  tags:
-    - install
-    - install:app-requirements
+  with_items: "{{ credentials_requirements }}"
 
 - name: create nodeenv
   shell: >

playbooks/roles/programs/tasks/main.yml

@@ -30,6 +30,7 @@
 - name: install application requirements
   pip:
     requirements: "{{ programs_requirements_base }}/{{ item }}"
+    # Ansible will initialize this virtualenv if it's missing.
     virtualenv: "{{ programs_venv_dir }}"
     state: present
   sudo_user: "{{ programs_user }}"