From d46837f31e95500311aa624cbd0722eb7a3d0d91 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 11 Sep 2019 13:23:05 +0100
Subject: [PATCH] Add python3 compatibility for source installs

Change-Id: Ic7dbf1edf12090b815207017bf514c47c50feeea
---
 tasks/ceilometer_install.yml | 14 ++++++++++++++
 vars/source_install.yml      |  4 +++-
 vars/suse.yml                |  6 ++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/tasks/ceilometer_install.yml b/tasks/ceilometer_install.yml
index 6b53a479..a4e44473 100644
--- a/tasks/ceilometer_install.yml
+++ b/tasks/ceilometer_install.yml
@@ -52,3 +52,17 @@
         option: "venv_tag"
         value: "{{ ceilometer_venv_tag }}"
   when: ceilometer_install_method == 'source'
+
+- name: Find the venv's python version
+  find:
+    paths: "{{ ceilometer_bin | dirname }}/lib/"
+    patterns: "python*"
+    file_type: directory
+    recurse: no
+  register: _ceilometer_python_venv_details
+  when: ceilometer_install_method == 'source'
+
+- name: Set python lib dir fact
+  set_fact:
+    ceilometer_lib_dir: "{{ _ceilometer_python_venv_details.files[0].path }}/site-packages"
+  when: ceilometer_install_method == 'source'
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 09d24535..6ff15fb8 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -22,4 +22,6 @@ ceilometer_package_list: |-
 
 _ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
 
-ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages"
+#NOTE(jrosser) for compatibility with py2 and py3 we detect the location of
+#this dir during the source install and set a fact
+#ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages"
diff --git a/vars/suse.yml b/vars/suse.yml
index cd04ba4f..e9f32330 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -16,7 +16,8 @@
 
 ceilometer_distro_packages:
   - git-core
-  - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
+  - python2-libvirt-python
+  - python3-libvirt-python
 
 ceilometer_devel_distro_packages:
   - pkg-config
@@ -41,6 +42,7 @@ ceilometer_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-digestmd5
 
 ceilometer_packages_to_symlink:
-  - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
+  - python2-libvirt-python
+  - python3-libvirt-python
 
 ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"