From dd7fb5f6ac6dc11027f3d916deaa86504f489197 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Fri, 12 Oct 2018 17:51:23 +0200
Subject: Update bifrost SHAs

There is a bug when ironic communicates with rabbitmq due to a parameter
deprecation. This patch fixes it:

https://review.openstack.org/#/c/609499/

And we can take the opportunity to update all SHAs

THere is a problem:

"Unable to retrieve file contents\nCould not find or access '/home/opnfv/releng-xci/xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml'"}

That file is in:

/home/opnfv/releng-xci/.cache/repos/bifrost/playbooks/roles/common/venv_python_path.yml

As I am not sure how to fix the ansible PATH, for the time being, I just
added to where Ansible is searching for it

Change-Id: I8e60f43ed7fc78a8925efaa36e41b0d872ea9a74
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 .../playbooks/roles/common/venv_python_path.yml    | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml

(limited to 'xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml')

diff --git a/xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml b/xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml
new file mode 100644
index 00000000..7f7ad670
--- /dev/null
+++ b/xci/infra/bifrost/playbooks/roles/common/venv_python_path.yml
@@ -0,0 +1,34 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- name: "If VENV is set in the environment, enable installation into venv"
+  set_fact:
+    enable_venv: true
+  when: lookup('env', 'VENV') | length > 0
+
+- name: "Retrieve venv python path"
+  shell: "/bin/echo -e \"import sys\\nprint(':'.join(sys.path))\" | {{ ansible_python.get('executable', '/usr/bin/python').split('/')[-1] }}"
+  environment: "{{ bifrost_venv_env | default({}) }}"
+  register: venv_pythonpath_result
+  when: enable_venv
+
+- name: "Compute venv python path"
+  set_fact:
+    venv_pythonpath:
+      PYTHONPATH: "{{ venv_pythonpath_result.get('stdout', '') }}"
+  when: enable_venv
+
+- name: "Compute proper complete venv including proper Python path"
+  set_fact:
+    venv: "{{ venv | default({}) | combine(bifrost_venv_env | default({})) | combine(venv_pythonpath | default({})) }}"
+
-- 
cgit 1.2.3-korg