From 3f5f393d22713b6eb4ef5d7f912102236f69f944 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Wed, 6 May 2020 12:22:36 +0300
Subject: [PATCH] Use openstack_venv_python_executable

Make masakari respect set openstack_venv_python_executable
This also will create py3 venvs by default

Change-Id: I9d7abbeff0f68cad3b646cde270437c88554080c
---
 defaults/main.yml | 1 +
 tasks/main.yml    | 1 +
 vars/debian.yml   | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8c91ee9..c1b5102 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,6 +21,7 @@ debug: False
 # clouds.yaml properly configured.
 masakari_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
 masakari_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((masakari_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+masakari_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}"
 
 # Set the package install state for distribution and pip packages
 # Options are 'present' and 'latest'
diff --git a/tasks/main.yml b/tasks/main.yml
index d7de583..ad8e4a5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -67,6 +67,7 @@
   import_role:
     name: "python_venv_build"
   vars:
+    venv_python_executable: "{{ masakari_venv_python_executable }}"
     venv_build_constraints: "{{ masakari_git_constraints }}"
     venv_build_distro_package_list: "{{ masakari_devel_distro_packages }}"
     venv_install_destination_path: "{{ masakari_bin | dirname }}"
diff --git a/vars/debian.yml b/vars/debian.yml
index d6f8900..a08008e 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -26,7 +26,7 @@ masakari_devel_distro_packages:
 
 masakari_monitor_distro_packages:
   - libsystemd-dev
-  - python-libvirt
+  - python3-libvirt
 
 masakari_monitor_packages_to_symlink:
-  - python-libvirt
+  - python3-libvirt