Commit 63a97e29 by John Jarvis

moving pip_index_url to group_vars

parent c76bc70e
...@@ -18,3 +18,4 @@ secure_dir: 'secure_example' ...@@ -18,3 +18,4 @@ secure_dir: 'secure_example'
# this indicates the path to site-specific (with precedence) # this indicates the path to site-specific (with precedence)
# things like nginx template files # things like nginx template files
local_dir: '../../ansible_local' local_dir: '../../ansible_local'
pip_index_url: 'https://pypi.python.org/simple'
...@@ -8,4 +8,3 @@ common_debian_pkgs: ...@@ -8,4 +8,3 @@ common_debian_pkgs:
- tree - tree
- git - git
- unzip - unzip
common_pip_index_url: 'https://pypy.edx.org/root/pypi/+simple/'
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
pip: > pip: >
name=virtualenv name=virtualenv
state=present state=present
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
tags: tags:
- venv_base - venv_base
- install - install
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
pip: > pip: >
name=virtualenvwrapper name=virtualenvwrapper
state=present state=present
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
tags: tags:
- venv_base - venv_base
- install - install
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
name=gunicorn name=gunicorn
virtualenv="{{venv_dir}}" virtualenv="{{venv_dir}}"
state=present state=present
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
tags: tags:
- gunicorn - gunicorn
- install - install
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
requirements="{{pre_requirements_file}}" requirements="{{pre_requirements_file}}"
virtualenv="{{venv_dir}}" virtualenv="{{venv_dir}}"
state=present state=present
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
tags: tags:
- lms - lms
- cms - cms
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
# Need to use shell rather than pip so that we can maintain the context of our current working directory; some # 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 # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
# installs everything into that virtual environment. # installs everything into that virtual environment.
shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ common_pip_index_url }} --exists-action w --use-mirrors -r {{ base_requirements_file }} shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ pip_index_url }} --exists-action w --use-mirrors -r {{ base_requirements_file }}
tags: tags:
- lms - lms
- cms - cms
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
requirements="{{post_requirements_file}}" requirements="{{post_requirements_file}}"
virtualenv="{{venv_dir}}" virtualenv="{{venv_dir}}"
state=present state=present
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
tags: tags:
- lms - lms
- cms - cms
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
# Need to use shell rather than pip so that we can maintain the context of our current working directory; some # 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 # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
# installs everything into that virtual environment. # installs everything into that virtual environment.
shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ common_pip_index_url }} --exists-action w --use-mirrors -r {{ item }} shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ pip_index_url }} --exists-action w --use-mirrors -r {{ item }}
with_items: with_items:
- "{{ repo_requirements_file }}" - "{{ repo_requirements_file }}"
- "{{ github_requirements_file }}" - "{{ github_requirements_file }}"
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
# Need to use shell rather than pip so that we can maintain the context of our current working directory; some # 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 # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
# installs everything into that virtual environment. # installs everything into that virtual environment.
shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ common_pip_index_url }} --exists-action w --use-mirrors -r {{ item }} shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install -i {{ pip_index_url }} --exists-action w --use-mirrors -r {{ item }}
with_items: with_items:
- "{{ sandbox_base_requirements }}" - "{{ sandbox_base_requirements }}"
- "{{ sandbox_local_requirements }}" - "{{ sandbox_local_requirements }}"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
name=pymongo name=pymongo
state=present state=present
version=2.6.3 version=2.6.3
extra_args="-i {{ common_pip_index_url }}" extra_args="-i {{ pip_index_url }}"
- name: edxlocal | create a database for edxapp - name: edxlocal | create a database for edxapp
mysql_db: > mysql_db: >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment