When parsing something like os_version: 9 YAML will, somewhat reasonably, decide that os_version is a number rather than a string. This would be okay if not for the fact that in-development versions of operating systems are usually assigned a codename rather than a version number (Debian sid, Fedora Rawhide, FreeBSD -CURRENT) and so we will always need to convert the version to string before comparison to account for that. Quote all details about the OS to make sure they're stored as strings to begin with. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/host_vars/libvirt-centos-7/main.yml | 6 +++--- guests/host_vars/libvirt-debian-8/main.yml | 6 +++--- guests/host_vars/libvirt-debian-9/main.yml | 6 +++--- guests/host_vars/libvirt-debian-sid/main.yml | 6 +++--- guests/host_vars/libvirt-fedora-28/main.yml | 6 +++--- guests/host_vars/libvirt-fedora-29/main.yml | 6 +++--- guests/host_vars/libvirt-fedora-rawhide/main.yml | 6 +++--- guests/host_vars/libvirt-freebsd-11/main.yml | 6 +++--- guests/host_vars/libvirt-freebsd-12/main.yml | 6 +++--- guests/host_vars/libvirt-freebsd-current/main.yml | 6 +++--- guests/host_vars/libvirt-ubuntu-16/main.yml | 6 +++--- guests/host_vars/libvirt-ubuntu-18/main.yml | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index 8be54b6..4e3692f 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -14,6 +14,6 @@ projects: - osinfo-db-tools - virt-viewer -package_format: rpm -os_name: CentOS -os_version: 7 +package_format: 'rpm' +os_name: 'CentOS' +os_version: '7' diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml index fb37205..0ac5130 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -13,6 +13,6 @@ projects: - osinfo-db-tools - virt-viewer -package_format: deb -os_name: Debian -os_version: 8 +package_format: 'deb' +os_name: 'Debian' +os_version: '8' diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index 33476ad..4a1b197 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -16,6 +16,6 @@ projects: - virt-manager - virt-viewer -package_format: deb -os_name: Debian -os_version: 9 +package_format: 'deb' +os_name: 'Debian' +os_version: '9' diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index f2594e7..911b491 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -16,6 +16,6 @@ projects: - virt-manager - virt-viewer -package_format: deb -os_name: Debian -os_version: Sid +package_format: 'deb' +os_name: 'Debian' +os_version: 'Sid' diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars/libvirt-fedora-28/main.yml index 13555af..dc1b3f3 100644 --- a/guests/host_vars/libvirt-fedora-28/main.yml +++ b/guests/host_vars/libvirt-fedora-28/main.yml @@ -17,6 +17,6 @@ projects: - virt-manager - virt-viewer -package_format: rpm -os_name: Fedora -os_version: 28 +package_format: 'rpm' +os_name: 'Fedora' +os_version: '28' diff --git a/guests/host_vars/libvirt-fedora-29/main.yml b/guests/host_vars/libvirt-fedora-29/main.yml index b6140ed..aba292d 100644 --- a/guests/host_vars/libvirt-fedora-29/main.yml +++ b/guests/host_vars/libvirt-fedora-29/main.yml @@ -17,6 +17,6 @@ projects: - virt-manager - virt-viewer -package_format: rpm -os_name: Fedora -os_version: 29 +package_format: 'rpm' +os_name: 'Fedora' +os_version: '29' diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 604f57f..d8d5dbc 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -27,6 +27,6 @@ projects: - virt-viewer+mingw32 - virt-viewer+mingw64 -package_format: rpm -os_name: Fedora -os_version: Rawhide +package_format: 'rpm' +os_name: 'Fedora' +os_version: 'Rawhide' diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index 887c9e6..ca32329 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -17,6 +17,6 @@ projects: - virt-manager - virt-viewer -package_format: pkg -os_name: FreeBSD -os_version: 11 +package_format: 'pkg' +os_name: 'FreeBSD' +os_version: '11' diff --git a/guests/host_vars/libvirt-freebsd-12/main.yml b/guests/host_vars/libvirt-freebsd-12/main.yml index ac50271..e8d6a49 100644 --- a/guests/host_vars/libvirt-freebsd-12/main.yml +++ b/guests/host_vars/libvirt-freebsd-12/main.yml @@ -17,6 +17,6 @@ projects: - virt-manager - virt-viewer -package_format: pkg -os_name: FreeBSD -os_version: 12 +package_format: 'pkg' +os_name: 'FreeBSD' +os_version: '12' diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index 1f3e911..3609ddb 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -17,6 +17,6 @@ projects: - virt-manager - virt-viewer -package_format: pkg -os_name: FreeBSD -os_version: Current +package_format: 'pkg' +os_name: 'FreeBSD' +os_version: 'Current' diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index 6ec1df8..11cd095 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -15,6 +15,6 @@ projects: - osinfo-db-tools - virt-viewer -package_format: deb -os_name: Ubuntu -os_version: 16 +package_format: 'deb' +os_name: 'Ubuntu' +os_version: '16' diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml index 61c7384..166d0e3 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -16,6 +16,6 @@ projects: - virt-manager - virt-viewer -package_format: deb -os_name: Ubuntu -os_version: 18 +package_format: 'deb' +os_name: 'Ubuntu' +os_version: '18' -- 2.19.2

Almost all our target operating systems have a version of Python 3 which is recent enough (>= 3.5) to be used by Ansible available. In fact, almost all of them have it pre-installed, which makes installing Python 2 in addition to it just to use Ansible, when Ansible itself would be absolutely happy running on Python 3, quite silly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/update/tasks/bootstrap.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml index d7abb86..f2b40e0 100644 --- a/guests/playbooks/update/tasks/bootstrap.yml +++ b/guests/playbooks/update/tasks/bootstrap.yml @@ -4,17 +4,32 @@ when: - package_format == 'pkg' +- set_fact: + python: python3 + +- set_fact: + python: python2 + when: + - os_name == 'CentOS' + - os_version == '7' + +- set_fact: + python: python + when: + - os_name == 'Debian' + - os_version == '8' + - name: Bootstrap Ansible - raw: yum install -y python2 + raw: 'yum install -y {{ python }}' when: - package_format == 'rpm' - name: Bootstrap Ansible - raw: apt-get install -y python + raw: 'apt-get install -y {{ python }}' when: - package_format == 'deb' - name: Bootstrap Ansible - raw: pkg install -y python2 + raw: 'pkg install -y {{ python }}' when: - package_format == 'pkg' -- 2.19.2

Now that we need to point Ansible to the Python binary explicitly and we prefer Python 3 to Python 2 while doing so, we might as well just re-use the path stored in the inventory instead of looking for it dynamically. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/update/tasks/paths.yml | 15 --------------- guests/playbooks/update/templates/bashrc.j2 | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/guests/playbooks/update/tasks/paths.yml b/guests/playbooks/update/tasks/paths.yml index 00decc9..08717ba 100644 --- a/guests/playbooks/update/tasks/paths.yml +++ b/guests/playbooks/update/tasks/paths.yml @@ -12,8 +12,6 @@ - gmake - java - make - - python2 - - python3 - su - name: 'Look for files' @@ -54,16 +52,3 @@ make: '{{ commands["make"] }}' when: - make is undefined - -# Prefer python3, fall back to python2 -- name: 'Export paths' - set_fact: - python: '{{ commands["python3"] }}' - when: - - commands["python3"] != '' - -- name: 'Export paths' - set_fact: - python: '{{ commands["python2"] }}' - when: - - python is undefined diff --git a/guests/playbooks/update/templates/bashrc.j2 b/guests/playbooks/update/templates/bashrc.j2 index f0ab23e..1f39cf2 100644 --- a/guests/playbooks/update/templates/bashrc.j2 +++ b/guests/playbooks/update/templates/bashrc.j2 @@ -1,7 +1,7 @@ export PS1="[\u@\h \w]\$ " export MAKE="{{ make }}" -export PYTHON="{{ python }}" +export PYTHON="{{ ansible_python_interpreter }}" export MAKEFLAGS="-j{{ install_vcpus|int + 1 }}" -- 2.19.2

Modern Ansible versions do this automatically. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/update/tasks/base.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 2899382..5cffbeb 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -1,12 +1,4 @@ --- -- name: Permit file editing on SELinux-enabled systems - package: - name: libselinux-python - state: present - when: - - ( os_name == 'CentOS' or - os_name == 'Fedora' ) - - name: Enable jessie-backports repository template: src: '{{ playbook_base }}/templates/jessie-backports.sources.j2' -- 2.19.2