From 483e3a7a6ff2186b68b00c29b35213bee8074ebe Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@opennext.io>
Date: Thu, 11 Oct 2018 12:24:18 +0200
Subject: [PATCH] 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 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
---
 .../roles/bifrost-ironic-install/tasks/inspector_install.yml  | 4 ++--
 playbooks/roles/bifrost-keystone-install/tasks/install.yml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml
index 5dc3e7a89..677bdbe28 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/inspector_install.yml
@@ -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 }}"
diff --git a/playbooks/roles/bifrost-keystone-install/tasks/install.yml b/playbooks/roles/bifrost-keystone-install/tasks/install.yml
index fd9fe81e7..74b61db06 100644
--- a/playbooks/roles/bifrost-keystone-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-keystone-install/tasks/install.yml
@@ -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