openstack/bifrost
Code Issues Proposed changes

Fix for proper installation

Browse Source 
When pip installed version does not support the
--upgrade-strategy (system installed version vs
venv installed one) we need to fallback into
case previous to 4d0c892e1054453774122a5aeefe0d3c26a35e91
Without this fix, Bifrost installation with Keystone
enabled and venv activated fails in task
bifrost-keystone-install : Install from /opt/stack/keystone using pip
with --upgrade-strategy unkown option

Change-Id: Ib5da14ba5048e48c66070c6d2a7f51aa6688a7d9
This commit is contained in:
Olivier Bourdon 2018-10-11 12:24:18 +02:00
parent 5a688a0110
commit 483e3a7a6f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +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 --upgrade-strategy only-if-needed -c {{ upper_constraints_file }}" extra_args="--no-cache-dir --upgrade {% if enable_venv | bool %}--upgrade-strategy only-if-needed{% else %}--force-reinstall{% endif %} -c {{ upper_constraints_file }}"
- name: "Inspector - PIP client install" - name: "Inspector - PIP client install"
include: pip_install.yml include: pip_install.yml
@ -27,4 +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 --upgrade-strategy only-if-needed -c {{ upper_constraints_file }}" extra_args="--no-cache-dir --upgrade {% if enable_venv | bool %}--upgrade-strategy only-if-needed{% else %}--force-reinstall{% endif %} -c {{ upper_constraints_file }}"

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

@ -62,7 +62,7 @@
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 --upgrade-strategy only-if-needed -c {{ upper_constraints_file }}" extra_args="--no-cache-dir --upgrade {% if enable_venv | bool %}--upgrade-strategy only-if-needed{% else %}--force-reinstall{% endif %} -c {{ upper_constraints_file }}"
when: when:
- skip_install is not defined - skip_install is not defined
- enable_venv | bool == true - enable_venv | bool == true
@ -97,7 +97,7 @@
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 --upgrade-strategy only-if-needed -c {{ upper_constraints_file }}" extra_args="--no-cache-dir --upgrade {% if enable_venv | bool %}--upgrade-strategy only-if-needed{% else %}--force-reinstall{% endif %} -c {{ upper_constraints_file }}"
when: when:
- skip_install is not defined - skip_install is not defined
- enable_venv | bool == false - enable_venv | bool == false