Merge pull request #977 from edx/feanil/local_pypi

Feanil/local pypi

AUTHORS

@@ -27,3 +27,4 @@ William Desloge <william.desloge@ionis-group.com>
 Valera Rozuvan <valera.rozuvan@gmail.com>
 Ker Ruben Ramos <xdiscent@gmail.com>
 Fred Smith <derf@edx.org>
+Wang Peifeng <pku9104038@hotmail.com>

playbooks/roles/devpi/tasks/main.yml

@@ -63,6 +63,7 @@
     name={{ item }}
     state=present
     virtualenv={{ devpi_venv_dir }}
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ devpi_user }}"
   with_items: devpi_pip_pkgs
   notify: restart devpi

playbooks/roles/discern/tasks/deploy.yml

@@ -46,7 +46,9 @@
 
 #Numpy has to be a pre-requirement in order for scipy to build
 - name : install python pre-requirements for discern and ease
-  pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
+  pip: >
+    requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"  
   sudo_user: "{{ discern_user }}"
   notify:
     - restart discern
@@ -55,7 +57,9 @@
     - "{{ discern_ease_pre_requirements_file }}"
 
 - name : install python requirements for discern and ease
-  pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
+  pip: >
+    requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ discern_user }}"
   notify:
     - restart discern

playbooks/roles/edx_ansible/tasks/deploy.yml

@@ -4,7 +4,9 @@
   sudo_user: "{{ edx_ansible_user }}"
 
 - name : install edx_ansible venv requirements
-  pip: requirements="{{ edx_ansible_requirements_file }}" virtualenv="{{ edx_ansible_venv_dir }}" state=present
+  pip: >
+    requirements="{{ edx_ansible_requirements_file }}" virtualenv="{{ edx_ansible_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ edx_ansible_user }}"
 
 - name: create update script

playbooks/roles/ora/tasks/deploy.yml

@@ -52,7 +52,9 @@
 
 # Install the python pre requirements into {{ ora_venv_dir }}
 - name: install python pre-requirements
-  pip: requirements="{{ ora_pre_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
+  pip: >
+    requirements="{{ ora_pre_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ ora_user }}"
   notify:
     - restart ora
@@ -60,7 +62,9 @@
 
 # Install the python post requirements into {{ ora_venv_dir }}
 - name: install python post-requirements
-  pip: requirements="{{ ora_post_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
+  pip: >
+    requirements="{{ ora_post_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ ora_user }}"
   notify:
     - restart ora

playbooks/roles/ora/tasks/ease.yml

@@ -16,7 +16,9 @@
 
 # Install the python pre requirements into {{ ora_ease_venv_dir }}
 - name: install ease python pre-requirements
-  pip: requirements="{{ora_ease_pre_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
+  pip: >
+    requirements="{{ora_ease_pre_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ ora_user }}"
   notify:
     - restart ora
@@ -24,7 +26,9 @@
 
 # Install the python post requirements into {{ ora_ease_venv_dir }}
 - name: install ease python post-requirements
-  pip: requirements="{{ora_ease_post_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
+  pip: >
+    requirements="{{ora_ease_post_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ ora_user }}"
   notify:
     - restart ora

playbooks/roles/supervisor/tasks/main.yml

@@ -87,11 +87,15 @@
 
 
 - name: install supervisor in its venv
-  pip: name=supervisor virtualenv="{{supervisor_venv_dir}}" state=present
+  pip: >
+    name=supervisor virtualenv="{{supervisor_venv_dir}}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ supervisor_user }}"
 
 - name: install supervisor in its venv
-  pip: name=boto virtualenv="{{supervisor_venv_dir}}" state=present
+  pip: >
+    name=boto virtualenv="{{supervisor_venv_dir}}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ supervisor_user }}"
   when: supervisor_service == "supervisor" and disable_edx_services and not devstack
 

playbooks/roles/xqueue/tasks/deploy.yml

@@ -36,14 +36,18 @@
 
 # Install the python pre requirements into {{ xqueue_venv_dir }}
 - name : install python pre-requirements
-  pip: requirements="{{ xqueue_pre_requirements_file }}" virtualenv="{{ xqueue_venv_dir }}" state=present
+  pip: >
+    requirements="{{ xqueue_pre_requirements_file }}" virtualenv="{{ xqueue_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ xqueue_user }}"
   notify:
     - restart xqueue
 
 # Install the python post requirements into {{ xqueue_venv_dir }}
 - name : install python post-requirements
-  pip: requirements="{{ xqueue_post_requirements_file }}" virtualenv="{{ xqueue_venv_dir }}" state=present
+  pip: >
+    requirements="{{ xqueue_post_requirements_file }}" virtualenv="{{ xqueue_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ xqueue_user }}"
   notify:
     - restart xqueue

playbooks/roles/xserver/tasks/deploy.yml

@@ -17,12 +17,16 @@
   notify: restart xserver
 
 - name: install requirements
-  pip: requirements="{{xserver_requirements_file}}" virtualenv="{{ xserver_venv_dir }}" state=present
+  pip: >
+    requirements="{{xserver_requirements_file}}" virtualenv="{{ xserver_venv_dir }}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ xserver_user }}"
   notify: restart xserver
 
 - name: install sandbox requirements
-  pip: requirements="{{xserver_requirements_file}}" virtualenv="{{xserver_venv_sandbox_dir}}" state=present
+  pip: >
+    requirements="{{xserver_requirements_file}}" virtualenv="{{xserver_venv_sandbox_dir}}" state=present
+    extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
   sudo_user: "{{ xserver_user }}"
   notify: restart xserver