Merge "Add missed extra_args to pip command"

This commit is contained in:
Jenkins 2017-03-23 09:08:16 +00:00 committed by Gerrit Code Review
commit bf80b2837c
4 changed files with 6 additions and 2 deletions

View File

@ -19,6 +19,7 @@
state=latest
sourcedir={{ ironicinspector_git_folder }}
source_install={{ ironicinspector_source_install }}
extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ reqs_git_folder }}/upper-constraints.txt"
- name: "Inspector - PIP client install"
include: pip_install.yml
@ -26,3 +27,4 @@
state=latest
source_dir={{ ironicinspectorclient_git_folder }}
sourc_install={{ ironicinspectorclient_source_install }}
extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ reqs_git_folder }}/upper-constraints.txt"

View File

@ -19,4 +19,4 @@
state=latest
sourcedir={{ staging_drivers_git_folder }}
source_install={{ staging_drivers_source_install }}
extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ reqs_git_folder }}/upper-constraints.txt"

View File

@ -44,4 +44,5 @@
state=latest
sourcedir={{ keystone_git_folder }}
source_install={{ keystone_source_install | bool }}
extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ reqs_git_folder }}/upper-constraints.txt"
when: skip_install is not defined

View File

@ -17,11 +17,12 @@
state: "{{ state | default(omit) }}"
version: "{{ version | default(omit) }}"
virtualenv: "{{ bifrost_venv_dir if enable_venv else omit }}"
extra_args: "{{ extra_args | default(omit) }}"
when: source_install is not defined or source_install == false
# NOTE (cinerama): We should be able to use the pip module here and
# possibly merge these two tasks when
# https://github.com/ansible/ansible-modules-core/pull/2600 lands.
- name: "Install from {{ sourcedir }} using pip"
command: pip install --upgrade {{ sourcedir }}
command: pip install --upgrade {{ sourcedir }} {{ extra_args | default('') }}
when: source_install is defined and (source_install | bool == true)
environment: "{{ bifrost_venv_env if enable_venv else '{}' }}"