Simplify pip install options

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

Change-Id: I8ef6c7bad92c5cae0ac00945e6ab94d9322c0097
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-09-03 21:03:06 -04:00
parent d93d1b0ff4
commit afd0a7e703
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 8 additions and 12 deletions

View File

@ -19,6 +19,7 @@ shade_git_version: master
shade_install_method: git
shade_pip_extra_args: ""
shade_pip_name: shade
shade_pip_version:
# shade_pip_extra_args:
# shade_pip_version:
# shade_pip_virtualenv:

View File

@ -20,5 +20,6 @@
- name: Pip install shade from local git repo.
pip:
extra_args: "{{ shade_pip_extra_args }}"
extra_args: "{{ shade_pip_extra_args|default(omit) }}"
name: "file://{{ shade_git_dest }}"
virtualenv: "{{ shade_pip_virtualenv|default(omit) }}"

View File

@ -14,13 +14,7 @@
---
- name: Install shade using pip.
pip:
extra_args: "{{ shade_pip_extra_args }}"
extra_args: "{{ shade_pip_extra_args|default(omit) }}"
name: "{{ shade_pip_name }}"
when: shade_pip_version is none
- name: Install shade using pip.
pip:
extra_args: "{{ shade_pip_extra_args }}"
name: "{{ shade_pip_name }}"
version: "{{ shade_pip_version }}"
when: shade_pip_version is not none
version: "{{ shade_pip_version|default(omit) }}"
virtualenv: "{{ shade_pip_virtualenv|default(omit) }}"