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
This commit is contained in:
Julia Kreger 2017-08-29 15:25:31 +00:00
parent 5cd8658842
commit d5bd22313a
1 changed files with 22 additions and 2 deletions

View File

@ -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