Simplify pip install options
Using the omit template, we can now better control with pip options we set. Change-Id: Id675758efbffb7b9a596bab9c0cccb0e1291c82e Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
e6e2da2c33
commit
ab5ae70356
|
@ -19,6 +19,6 @@ diskimage_builder_git_version: master
|
||||||
|
|
||||||
diskimage_builder_install_method: git
|
diskimage_builder_install_method: git
|
||||||
|
|
||||||
diskimage_builder_pip_extra_args: ""
|
|
||||||
diskimage_builder_pip_name: diskimage-builder
|
diskimage_builder_pip_name: diskimage-builder
|
||||||
diskimage_builder_pip_version:
|
# diskimage_builder_pip_extra_args:
|
||||||
|
# diskimage_builder_pip_version:
|
||||||
|
|
|
@ -20,5 +20,5 @@
|
||||||
|
|
||||||
- name: Pip install diskimage-builder from local git repo.
|
- name: Pip install diskimage-builder from local git repo.
|
||||||
pip:
|
pip:
|
||||||
extra_args: "{{ diskimage_builder_pip_extra_args }}"
|
|
||||||
name: "file://{{ diskimage_builder_git_dest }}"
|
name: "file://{{ diskimage_builder_git_dest }}"
|
||||||
|
extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}"
|
||||||
|
|
|
@ -14,13 +14,6 @@
|
||||||
---
|
---
|
||||||
- name: Install diskimage-builder using pip.
|
- name: Install diskimage-builder using pip.
|
||||||
pip:
|
pip:
|
||||||
extra_args: "{{ diskimage_builder_pip_extra_args }}"
|
extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}"
|
||||||
name: "{{ diskimage_builder_pip_name }}"
|
name: "{{ diskimage_builder_pip_name }}"
|
||||||
when: diskimage_builder_pip_version is none
|
version: "{{ diskimage_builder_pip_version|default(omit) }}"
|
||||||
|
|
||||||
- name: Install diskimage-builder using pip.
|
|
||||||
pip:
|
|
||||||
extra_args: "{{ diskimage_builder_pip_extra_args }}"
|
|
||||||
name: "{{ diskimage_builder_pip_name }}"
|
|
||||||
version: "{{ diskimage_builder_pip_version }}"
|
|
||||||
when: diskimage_builder_pip_version is not none
|
|
||||||
|
|
Loading…
Reference in New Issue