From ab5ae70356b2704197b0a05e40767986dcd6cbf7 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 19 Feb 2016 17:11:11 -0500 Subject: [PATCH] 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 --- defaults/main.yaml | 4 ++-- tasks/install/git.yaml | 2 +- tasks/install/pip.yaml | 11 ++--------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 5f3a828..f8e4829 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -19,6 +19,6 @@ diskimage_builder_git_version: master diskimage_builder_install_method: git -diskimage_builder_pip_extra_args: "" diskimage_builder_pip_name: diskimage-builder -diskimage_builder_pip_version: +# diskimage_builder_pip_extra_args: +# diskimage_builder_pip_version: diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml index 055c0d5..8e023a0 100644 --- a/tasks/install/git.yaml +++ b/tasks/install/git.yaml @@ -20,5 +20,5 @@ - name: Pip install diskimage-builder from local git repo. pip: - extra_args: "{{ diskimage_builder_pip_extra_args }}" name: "file://{{ diskimage_builder_git_dest }}" + extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}" diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml index 40dbcc6..e18e0f2 100644 --- a/tasks/install/pip.yaml +++ b/tasks/install/pip.yaml @@ -14,13 +14,6 @@ --- - name: Install diskimage-builder using pip. pip: - extra_args: "{{ diskimage_builder_pip_extra_args }}" + extra_args: "{{ diskimage_builder_pip_extra_args|default(omit) }}" name: "{{ diskimage_builder_pip_name }}" - when: diskimage_builder_pip_version is none - -- 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 + version: "{{ diskimage_builder_pip_version|default(omit) }}"