Default nodepool_pip_executable to pip3
Moving forward, we'll only support nodepool under python3. Change-Id: If0f9ed013819b68601e28ecfbeffa40a41d19ebc Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
3d96a9ae01
commit
407d827893
|
@ -6,10 +6,6 @@
|
||||||
- name: openstack-infra/nodepool
|
- name: openstack-infra/nodepool
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack/ansible-role-nodepool
|
- zuul: openstack/ansible-role-nodepool
|
||||||
vars:
|
|
||||||
# TODO(pabelanger): This needs to fix to defaut to this when not using
|
|
||||||
# a virtualenv.
|
|
||||||
nodepool_pip_executable: pip3
|
|
||||||
|
|
||||||
# Testing for nodepool_install_method: pip
|
# Testing for nodepool_install_method: pip
|
||||||
- job:
|
- job:
|
||||||
|
|
|
@ -20,6 +20,8 @@ including Jenkins and Zuul.
|
||||||
Requirements
|
Requirements
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
* pip3 to be installed if using nodepool_install_method: (git|pip)
|
||||||
|
|
||||||
Packages
|
Packages
|
||||||
~~~~~~~~
|
~~~~~~~~
|
||||||
|
|
||||||
|
|
|
@ -25,4 +25,12 @@
|
||||||
with_items: "{{ nodepool_build_depends }}"
|
with_items: "{{ nodepool_build_depends }}"
|
||||||
when: nodepool_install_method == 'git'
|
when: nodepool_install_method == 'git'
|
||||||
|
|
||||||
|
- name: Define nodepool_pip_executable if needed.
|
||||||
|
set_fact:
|
||||||
|
nodepool_pip_executable: pip3
|
||||||
|
when:
|
||||||
|
- nodepool_install_method == 'git' or nodepool_install_method == 'pip'
|
||||||
|
- nodepool_pip_virtualenv_python is not defined
|
||||||
|
- nodepool_pip_executable is not defined
|
||||||
|
|
||||||
- include: "install/{{ nodepool_install_method }}.yaml"
|
- include: "install/{{ nodepool_install_method }}.yaml"
|
||||||
|
|
Loading…
Reference in New Issue