openstack/bifrost
Code Issues Proposed changes

Add missed extra_args to pip command

Browse Source 
Change-Id: I31fad709bd341503d9c23f6ee07be133c6c6471f
This commit is contained in:
Andrey Shestakov 2017-03-22 13:43:33 +02:00
parent b571d0d3b5
commit ecece0c835
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml
View File

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

2
playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml
View File

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

1
playbooks/roles/bifrost-keystone-install/tasks/install.yml
View File

@ -44,4 +44,5 @@
state=latest state=latest
sourcedir={{ keystone_git_folder }} sourcedir={{ keystone_git_folder }}
source_install={{ keystone_source_install | bool }} 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 when: skip_install is not defined

3
playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml
View File

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