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

@@ -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
 

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) }}"

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) }}"