Fix for proper installation
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 4d0c892e10
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:
parent
5a688a0110
commit
483e3a7a6f
|
@ -19,7 +19,7 @@
|
|||
state=latest
|
||||
sourcedir={{ ironicinspector_git_folder }}
|
||||
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"
|
||||
include: pip_install.yml
|
||||
|
@ -27,4 +27,4 @@
|
|||
state=latest
|
||||
source_dir={{ ironicinspectorclient_git_folder }}
|
||||
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 }}"
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
state=latest
|
||||
sourcedir={{ keystone_git_folder }}
|
||||
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:
|
||||
- skip_install is not defined
|
||||
- enable_venv | bool == true
|
||||
|
@ -97,7 +97,7 @@
|
|||
state=latest
|
||||
sourcedir={{ keystone_git_folder }}
|
||||
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:
|
||||
- skip_install is not defined
|
||||
- enable_venv | bool == false
|
||||
|
|
Loading…
Reference in New Issue