From 7001a8387a2ebbafef63481ca57c5a2afc9267dc Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Wed, 22 Feb 2017 14:58:33 +0000
Subject: [PATCH] playbooks: roles: {ironic,keystone}: Drop --force-reinstall

setuptools seems to have some race issues when forcing a package
reinstallation with 'pip install --upgrade --force-reinstall' as
described in https://github.com/pypa/setuptools/issues/951. Until
a fixed 'pip' or 'setuptools' is released, we drop the
--force-reinstall option in order to avoid the said race.

Closes-Bug: #1667308
Change-Id: I26863dd277c7adfc1097b622069c5222b84351c7
---
 playbooks/roles/bifrost-ironic-install/tasks/install.yml       | 2 +-
 playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
index 6f01211e8..53905f481 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -91,7 +91,7 @@
     state=latest
     sourcedir={{ ironic_git_folder }}
     source_install=true
-    extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ reqs_git_folder }}/upper-constraints.txt"
+    extra_args="--no-cache-dir --upgrade -c {{ reqs_git_folder }}/upper-constraints.txt"
   when: skip_install is not defined
 - name: "Install ironic-inspector to permit use of inspection interface"
   include: inspector_install.yml
diff --git a/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml b/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml
index f16221159..a7c1545ff 100644
--- a/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml
+++ b/playbooks/roles/bifrost-keystone-install/tasks/pip_install.yml
@@ -22,6 +22,6 @@
 # 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 --force-reinstall {{ sourcedir }}
+  command: pip install --upgrade {{ sourcedir }}
   when: source_install is defined and (source_install | bool == true)
   environment: "{{ bifrost_venv_env if enable_venv else '{}' }}"