From 6c5f46469eaf968f0b7cfc8d88b61f70a3297ab9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sun, 4 Sep 2016 09:55:54 -0400
Subject: [PATCH] Simplify pip install options
Using the omit template, we can now better control which pip options
we set.
Change-Id: I3a520ebee0c6babd7d2ebfd60d4f3add34ef1deb
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
defaults/main.yaml | 4 +++-
tasks/install/git.yaml | 3 +++
tasks/install/pip.yaml | 10 +++-------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/defaults/main.yaml b/defaults/main.yaml
index d5c6fe1..b182b35 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -46,7 +46,9 @@ jenkins_job_builder_git_version: master
jenkins_job_builder_install_method: git
jenkins_job_builder_pip_name: jenkins-job-builder
-jenkins_job_builder_pip_version:
+# jenkins_job_builder_pip_extra_args:
+# jenkins_job_builder_pip_version:
+# jenkins_job_builder_pip_virtualenv:
jenkins_job_builder_package_name: python-jenkins-job-builder
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index 66b94bc..cdf44ff 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -20,4 +20,7 @@
- name: Pip install jenkins_job_builder from local git repo.
pip:
+ extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
name: "file://{{ jenkins_job_builder_git_dest }}"
+ version: "{{ jenkins_job_builder_pip_version|default(omit) }}"
+ virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}"
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index e21a0ec..7e76237 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -14,11 +14,7 @@
---
- name: Install jenkins job builder using pip.
pip:
+ extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
name: "{{ jenkins_job_builder_pip_name }}"
- when: jenkins_job_builder_pip_version is none
-
-- name: Install jenkins job builder using pip.
- pip:
- name: "{{ jenkins_job_builder_pip_name }}"
- version: "{{ jenkins_job_builder_pip_version }}"
- when: jenkins_job_builder_pip_version is not none
+ version: "{{ jenkins_job_builder_pip_version|default(omit) }}"
+ virtualenv: "{{ jenkins_job_builder_pip_virtualenv|default(omit) }}"