From f205815336a3ef83db52c0564d75818ce187073b Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@opennext.io>
Date: Wed, 4 Jul 2018 10:45:35 +0200
Subject: [PATCH] Fix installation of keystone module when using venv

Change-Id: I0cf8584e87e5c745584c62822dd6416d3c57cb04
---
 .../bifrost-keystone-install/tasks/install.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/bifrost-keystone-install/tasks/install.yml b/playbooks/roles/bifrost-keystone-install/tasks/install.yml
index dcf0aa31d..d9ff62573 100644
--- a/playbooks/roles/bifrost-keystone-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-keystone-install/tasks/install.yml
@@ -57,6 +57,18 @@
     - skip_install is not defined
     - enable_venv | bool == true
 
+- name: "Install keystone in venv if using"
+  include: pip_install.yml
+    package=keystone
+    virtualenv=bifrost_venv_dir
+    state=latest
+    sourcedir={{ keystone_git_folder }}
+    source_install={{ keystone_source_install | bool }}
+    extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ upper_constraints_file }}"
+  when:
+    - skip_install is not defined
+    - enable_venv | bool == true
+
 - name: "Install configparser if not using a venv"
   include: pip_install.yml
     package=configparser
@@ -81,11 +93,13 @@
     - skip_install is not defined
     - enable_venv | bool == false
 
-- name: "Install keystone using pip"
+- name: "Install keystone if not using a venv"
   include: pip_install.yml
     package=keystone
     state=latest
     sourcedir={{ keystone_git_folder }}
     source_install={{ keystone_source_install | bool }}
     extra_args="--no-cache-dir --upgrade --force-reinstall -c {{ upper_constraints_file }}"
-  when: skip_install is not defined
+  when:
+    - skip_install is not defined
+    - enable_venv | bool == false