[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [jenkins-ci PATCH 4/7] guests: Use ansible_python_interpreter everywhere



So far we've only needed to use ansible_python_interpreter
for FreeBSD, where Ansible is unable to locate the Python
binary itself; nowever, now that we want to use Python 3
instead of the default Python 2 almost everywhere, we need
to make sure we always point Ansible to the appropriate
Python binary.

Signed-off-by: Andrea Bolognani <abologna redhat com>
---
 guests/host_vars/libvirt-centos-7/main.yml        | 2 ++
 guests/host_vars/libvirt-debian-8/main.yml        | 2 ++
 guests/host_vars/libvirt-debian-9/main.yml        | 2 ++
 guests/host_vars/libvirt-debian-sid/main.yml      | 2 ++
 guests/host_vars/libvirt-fedora-28/main.yml       | 2 ++
 guests/host_vars/libvirt-fedora-29/main.yml       | 2 ++
 guests/host_vars/libvirt-fedora-rawhide/main.yml  | 2 ++
 guests/host_vars/libvirt-freebsd-11/main.yml      | 4 ++--
 guests/host_vars/libvirt-freebsd-12/main.yml      | 4 ++--
 guests/host_vars/libvirt-freebsd-current/main.yml | 4 ++--
 guests/host_vars/libvirt-ubuntu-16/main.yml       | 2 ++
 guests/host_vars/libvirt-ubuntu-18/main.yml       | 2 ++
 12 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 4e3692f..da05935 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -17,3 +17,5 @@ projects:
 package_format: 'rpm'
 os_name: 'CentOS'
 os_version: '7'
+
+ansible_python_interpreter: /usr/bin/python2
diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml
index 0ac5130..c5b82b3 100644
--- a/guests/host_vars/libvirt-debian-8/main.yml
+++ b/guests/host_vars/libvirt-debian-8/main.yml
@@ -16,3 +16,5 @@ projects:
 package_format: 'deb'
 os_name: 'Debian'
 os_version: '8'
+
+ansible_python_interpreter: /usr/bin/python2
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index 4a1b197..ec7e6b4 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -19,3 +19,5 @@ projects:
 package_format: 'deb'
 os_name: 'Debian'
 os_version: '9'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml
index 911b491..1c7a29b 100644
--- a/guests/host_vars/libvirt-debian-sid/main.yml
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -19,3 +19,5 @@ projects:
 package_format: 'deb'
 os_name: 'Debian'
 os_version: 'Sid'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars/libvirt-fedora-28/main.yml
index dc1b3f3..b12a670 100644
--- a/guests/host_vars/libvirt-fedora-28/main.yml
+++ b/guests/host_vars/libvirt-fedora-28/main.yml
@@ -20,3 +20,5 @@ projects:
 package_format: 'rpm'
 os_name: 'Fedora'
 os_version: '28'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-29/main.yml b/guests/host_vars/libvirt-fedora-29/main.yml
index aba292d..bebf171 100644
--- a/guests/host_vars/libvirt-fedora-29/main.yml
+++ b/guests/host_vars/libvirt-fedora-29/main.yml
@@ -20,3 +20,5 @@ projects:
 package_format: 'rpm'
 os_name: 'Fedora'
 os_version: '29'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index d8d5dbc..ed0a3fa 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -30,3 +30,5 @@ projects:
 package_format: 'rpm'
 os_name: 'Fedora'
 os_version: 'Rawhide'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml
index ca32329..ed805c9 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b/guests/host_vars/libvirt-freebsd-11/main.yml
@@ -1,6 +1,4 @@
 ---
-ansible_python_interpreter: /usr/local/bin/python2
-
 projects:
   - libosinfo
   - libvirt
@@ -20,3 +18,5 @@ projects:
 package_format: 'pkg'
 os_name: 'FreeBSD'
 os_version: '11'
+
+ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-12/main.yml b/guests/host_vars/libvirt-freebsd-12/main.yml
index e8d6a49..8bbe158 100644
--- a/guests/host_vars/libvirt-freebsd-12/main.yml
+++ b/guests/host_vars/libvirt-freebsd-12/main.yml
@@ -1,6 +1,4 @@
 ---
-ansible_python_interpreter: /usr/local/bin/python2
-
 projects:
   - libosinfo
   - libvirt
@@ -20,3 +18,5 @@ projects:
 package_format: 'pkg'
 os_name: 'FreeBSD'
 os_version: '12'
+
+ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml
index 3609ddb..62498fd 100644
--- a/guests/host_vars/libvirt-freebsd-current/main.yml
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -1,6 +1,4 @@
 ---
-ansible_python_interpreter: /usr/local/bin/python2
-
 projects:
   - libosinfo
   - libvirt
@@ -20,3 +18,5 @@ projects:
 package_format: 'pkg'
 os_name: 'FreeBSD'
 os_version: 'Current'
+
+ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml
index 11cd095..0e38128 100644
--- a/guests/host_vars/libvirt-ubuntu-16/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-16/main.yml
@@ -18,3 +18,5 @@ projects:
 package_format: 'deb'
 os_name: 'Ubuntu'
 os_version: '16'
+
+ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml
index 166d0e3..bb465e8 100644
--- a/guests/host_vars/libvirt-ubuntu-18/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-18/main.yml
@@ -19,3 +19,5 @@ projects:
 package_format: 'deb'
 os_name: 'Ubuntu'
 os_version: '18'
+
+ansible_python_interpreter: /usr/bin/python3
-- 
2.19.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]