From 6677bb39f6a6c8daf5cf12c1459d885e8f79bed7 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 9 Jan 2020 14:01:40 -0800
Subject: [PATCH] Hopefully final venv fixes

Also uncapped the proliantutils maximum as upper
constraints is in place.

Set the ansible python interpreter as well for the
main process launch, which magically resolved
venv dependency issues.

Change-Id: Iae06a87e7dbcf76e4be7453e57ec5fd75389caa7
---
 playbooks/roles/bifrost-ironic-install/tasks/install.yml | 3 +--
 scripts/test-bifrost.sh                                  | 1 +
 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 97c992fff..2ac5e08fa 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -43,14 +43,13 @@
 
 - name: "proliantutils - Install from pip"
   include: pip_install.yml
-     package=proliantutils<2.9.0
+     package=proliantutils
      state=present
   environment: "{{ venv }}"
   when: skip_install is not defined
 
 - name: "Install iSCSI client and dependencies if iscsi deploy interface is enabled"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  environment: "{{ venv }}"
   with_items: "{{ iscsi_required_packages }}"
   when: skip_install is not defined and 'iscsi' in enabled_deploy_interfaces
 
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index f9a449dbf..418f35dbc 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -184,6 +184,7 @@ export BIFROST_INVENTORY_SOURCE=${BAREMETAL_DATA_FILE}
 ${ANSIBLE} -vvvv \
     -i inventory/bifrost_inventory.py \
     ${TEST_PLAYBOOK} \
+    -e ansible_python_interpreter="${ANSIBLE_PYTHON_INTERP}" \
     -e use_cirros=${USE_CIRROS} \
     -e testing_user=${TESTING_USER} \
     -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \