From d5bd22313a124ca08925128861c1ddba7f08e7d6 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 29 Aug 2017 15:25:31 +0000 Subject: [PATCH] Fix non-venv keystone handling Turns out we were not installing two items that are regardless of being in a venv, however we were installing only when a venv was defined, and as a result the job was failing in certian ci test cases since keystone has not been previously required to be used by any job. Change-Id: I27358add99ab40c988627f2362e0f07c2324c670 --- .../tasks/install.yml | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/bifrost-keystone-install/tasks/install.yml b/playbooks/roles/bifrost-keystone-install/tasks/install.yml index 73d7534db..d6cef34de 100644 --- a/playbooks/roles/bifrost-keystone-install/tasks/install.yml +++ b/playbooks/roles/bifrost-keystone-install/tasks/install.yml @@ -35,14 +35,34 @@ package=configparser virtualenv=bifrost_venv_dir extra_args="-c {{ upper_constraints_file }}" - when: skip_install is not defined and (enable_venv | bool == true) + when: + - skip_install is not defined + - enable_venv | bool == true - name: "Install pymysql in venv if using" include: pip_install.yml package=pymysql virtualenv=bifrost_venv_dir extra_args="-c {{ upper_constraints_file }}" - when: skip_install is not defined and (enable_venv | bool == true) + when: + - skip_install is not defined + - enable_venv | bool == true + +- name: "Install configparser if not using a venv" + include: pip_install.yml + package=configparser + extra_args="-c {{ upper_constraints_file }}" + when: + - skip_install is not defined + - enable_venv | bool == false + +- name: "Install pymysql if not using a venv" + include: pip_install.yml + package=pymysql + extra_args="-c {{ upper_constraints_file }}" + when: + - skip_install is not defined + - enable_venv | bool == false - name: "Install keystone using pip" include: pip_install.yml