summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2017-05-31 12:01:36 -0400
committerPaul Belanger <pabelanger@redhat.com>2017-05-31 12:01:36 -0400
commit164d71110abbb61885de99ccf23f5332f832ed79 (patch)
treefcfe15bb69e6992668fe8b52c133ec3f6e1acfed
parentc8103941ba4c80a51f4ad23b97d8da6a5556afa7 (diff)
Create nodepool_pip_executable variable
Allow the user to override the location of the pip executable. Change-Id: I47a13c168abcf35eb791ac602532fcea3f0e2a1e Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 31 May 2017 16:43:45 +0000 Reviewed-on: https://review.openstack.org/469549 Project: openstack/ansible-role-nodepool Branch: refs/heads/master
-rw-r--r--defaults/main.yaml1
-rw-r--r--tasks/install/pip.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/defaults/main.yaml b/defaults/main.yaml
index 4c79ce9..224065a 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -63,6 +63,7 @@ nodepool_git_version: feature/zuulv3
63nodepool_install_method: git 63nodepool_install_method: git
64 64
65nodepool_pip_name: nodepool 65nodepool_pip_name: nodepool
66# nodepool_pip_executable:
66# nodepool_pip_extra_args: 67# nodepool_pip_extra_args:
67# nodepool_pip_version: 68# nodepool_pip_version:
68# nodepool_pip_virtualenv_python: 69# nodepool_pip_virtualenv_python:
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index 7a74641..8f31bcf 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -15,6 +15,7 @@
15- name: Install nodepool using pip. 15- name: Install nodepool using pip.
16 become: yes 16 become: yes
17 pip: 17 pip:
18 executable: "{{ nodepool_pip_executable|default(omit) }}"
18 extra_args: "{{ nodepool_pip_extra_args|default(omit) }}" 19 extra_args: "{{ nodepool_pip_extra_args|default(omit) }}"
19 name: "{{ nodepool_pip_name }}" 20 name: "{{ nodepool_pip_name }}"
20 version: "{{ nodepool_pip_version|default(omit) }}" 21 version: "{{ nodepool_pip_version|default(omit) }}"