windmill/ansible-role-zuul
Code Issues Proposed changes

Simplify pip install options

Browse Source 
Using the omit template, we can now better control which pip options
we set.

Change-Id: I8a3abc0b623a75e1f695441f96b922a2a72e41f7
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-28 13:11:48 -04:00
parent bc0cb78b77
commit 8bbca0e120
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yaml
View File

@ -67,7 +67,10 @@ zuul_git_version: master
zuul_install_method: git zuul_install_method: git
zuul_pip_version: zuul_pip_name: zuul
#zuul_pip_extra_args:
#zuul_pip_version:
#zuul_pip_virtualenv:
# tasks/service.yaml # tasks/service.yaml
zuul_file_zuul_service_config_group: root zuul_file_zuul_service_config_group: root

2
tasks/install/git.yaml
View File

@ -22,4 +22,6 @@
- name: Pip install zuul from local git repo. - name: Pip install zuul from local git repo.
become: yes become: yes
pip: pip:
extra_args: "{{ zuul_pip_extra_args|default(omit) }}"
name: "file://{{ zuul_git_dest }}" name: "file://{{ zuul_git_dest }}"
virtualenv: "{{ zuul_pip_virtualenv|default(omit) }}"

13
tasks/install/pip.yaml
View File

@ -15,12 +15,7 @@
- name: Install zuul using pip. - name: Install zuul using pip.
become: yes become: yes
pip: pip:
name: zuul extra_args: "{{ zuul_pip_extra_args|default(omit) }}"
when: zuul_pip_version is none name: "{{ zuul_pip_name }}"
version: "{{ zuul_pip_version|default(omit) }}"
- name: Install zuul using pip. virtualenv: "{{ zuul_pip_virtualenv|default(omit) }}"
become: yes
pip:
name: zuul
version: "{{ zuul_pip_version }}"
when: zuul_pip_version is not none