From ecece0c835f83d99ae3244ab8ff9ed2f3925ad92 Mon Sep 17 00:00:00 2001 From: Andrey Shestakov Date: Wed, 22 Mar 2017 13:43:33 +0200 Subject: [PATCH] Add missed extra_args to pip command Change-Id: I31fad709bd341503d9c23f6ee07be133c6c6471f --- .../roles/bifrost-ironic-install/tasks/inspector_install.yml | 2 ++ .../roles/bifrost-ironic-install/tasks/staging_install.yml | 2 +- playbooks/roles/bifrost-keystone-install/tasks/install.yml | 1 + playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml index 33177459b..239e4f4d2 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml @@ -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" diff --git a/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml index 5e2124874..0e2624714 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/staging_install.yml @@ -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" diff --git a/playbooks/roles/bifrost-keystone-install/tasks/install.yml b/playbooks/roles/bifrost-keystone-install/tasks/install.yml index 5a8de4f42..dfb5ac6bd 100644 --- a/playbooks/roles/bifrost-keystone-install/tasks/install.yml +++ b/playbooks/roles/bifrost-keystone-install/tasks/install.yml @@ -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 diff --git a/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml b/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml index a7c1545ff..f49fcc6a9 100644 --- a/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml +++ b/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml @@ -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 '{}' }}"