renaming PYPI_MIRROR to PYPI_MIRROR_URL

playbooks/group_vars/all

@@ -18,5 +18,7 @@ secure_dir: 'secure_example'
 # this indicates the path to site-specific (with precedence)
 # things like nginx template files
 local_dir:  '../../ansible_local'
-PYPI_MIRROR: 'https://pypi.python.org/simple'
-GIT_MIRROR: 'https://github.com'
+# include http/https
+PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
+# do not include http/https
+GIT_MIRROR: 'github.com'

playbooks/roles/common/tasks/create_venv.yml

@@ -14,7 +14,7 @@
   pip: >
     name=virtualenv 
     state=present
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags:
   - venv_base
   - install
@@ -23,7 +23,7 @@
   pip: >
     name=virtualenvwrapper 
     state=present
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags:
   - venv_base
   - install
@@ -45,7 +45,7 @@
     name=gunicorn 
     virtualenv="{{venv_dir}}" 
     state=present
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags:
   - gunicorn
   - install

playbooks/roles/edxapp/tasks/deploy.yml

@@ -126,7 +126,7 @@
     requirements="{{pre_requirements_file}}" 
     virtualenv="{{venv_dir}}" 
     state=present
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags:
   - lms
   - cms
@@ -138,7 +138,7 @@
   # Need to use shell 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.
-  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR }} --exists-action w --use-mirrors -r {{ base_requirements_file }}
+  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR_URL }} --exists-action w --use-mirrors -r {{ base_requirements_file }}
   tags:
   - lms
   - cms
@@ -151,7 +151,7 @@
     requirements="{{post_requirements_file}}" 
     virtualenv="{{venv_dir}}" 
     state=present
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags:
   - lms
   - cms
@@ -163,7 +163,7 @@
   # Need to use shell 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.
-  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR }} --exists-action w --use-mirrors -r {{ item }}
+  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR_URL }} --exists-action w --use-mirrors -r {{ item }}
   with_items:
   - "{{ repo_requirements_file }}"
   - "{{ github_requirements_file }}"
@@ -180,7 +180,7 @@
   # Need to use shell 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.
-  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR }} --exists-action w --use-mirrors -r {{ item }}
+  shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ PYPI_MIRROR_URL }} --exists-action w --use-mirrors -r {{ item }}
   with_items:
   - "{{ sandbox_base_requirements }}"
   - "{{ sandbox_local_requirements }}"

playbooks/roles/edxlocal/tasks/main.yml

@@ -18,7 +18,7 @@
     name=pymongo 
     state=present 
     version=2.6.3
-    extra_args="-i {{ PYPI_MIRROR }}"
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
 
 - name: edxlocal | create a database for edxapp
   mysql_db: >

util/jenkins/ansible-deploy.sh

@@ -48,7 +48,7 @@ ora_version: $ora_version
 ease_version: $ease_version
 
 ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
-PYPI_MIRROR: 'https://pypi.edx.org/root/pypi/+simple/'
+PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
 EOF
 
 cat $extra_vars

util/jenkins/ansible-provision.sh

@@ -79,7 +79,7 @@ region: $region
 instance_tags: '{"environment": "$environment", "github_username": "$github_username", "Name": "$name_tag", "source": "jenkins", "owner": "$BUILD_USER"}'
 root_ebs_size: $root_ebs_size
 name_tag: $name_tag
-PYPI_MIRROR: 'https://pypi.edx.org/root/pypi/+simple/'
+PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
 gh_users:
   - user: jarv
     groups: