From 4d95bb1421426eb5d3eceacad1ebec56354be331 Mon Sep 17 00:00:00 2001 From: Richard Arends Date: Wed, 28 Aug 2019 11:33:15 +0200 Subject: [PATCH] Use python3-libselinux on RHEL8/Centos8 (#5127) * Use python3-libselinux on RHEL8/Centos8 * The fact ansible_facts.distribution_major_version is not present on older Ansible version. Default it to 0 in when not present and use libselinux-python as package to get current default behaviour. --- roles/bootstrap-os/tasks/bootstrap-centos.yml | 4 ++-- roles/kubernetes/preinstall/vars/centos.yml | 2 +- roles/kubernetes/preinstall/vars/redhat.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/bootstrap-os/tasks/bootstrap-centos.yml b/roles/bootstrap-os/tasks/bootstrap-centos.yml index 52e6df791..057231a07 100644 --- a/roles/bootstrap-os/tasks/bootstrap-centos.yml +++ b/roles/bootstrap-os/tasks/bootstrap-centos.yml @@ -39,9 +39,9 @@ # libselinux-python is required on SELinux enabled hosts # See https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#managed-node-requirements -- name: Install libselinux-python +- name: Install libselinux python package package: - name: libselinux-python + name: "{{ ( (ansible_facts.distribution_major_version | default(0) | int) < 8) | ternary('libselinux-python','python3-libselinux') }}" state: present become: true when: diff --git a/roles/kubernetes/preinstall/vars/centos.yml b/roles/kubernetes/preinstall/vars/centos.yml index 67fbfe085..68406d61d 100644 --- a/roles/kubernetes/preinstall/vars/centos.yml +++ b/roles/kubernetes/preinstall/vars/centos.yml @@ -1,6 +1,6 @@ --- required_pkgs: - - libselinux-python + - "{{ ( (ansible_facts.distribution_major_version | default(0) | int) < 8) | ternary('libselinux-python','python3-libselinux') }}" - device-mapper-libs - ebtables - nss diff --git a/roles/kubernetes/preinstall/vars/redhat.yml b/roles/kubernetes/preinstall/vars/redhat.yml index 67fbfe085..68406d61d 100644 --- a/roles/kubernetes/preinstall/vars/redhat.yml +++ b/roles/kubernetes/preinstall/vars/redhat.yml @@ -1,6 +1,6 @@ --- required_pkgs: - - libselinux-python + - "{{ ( (ansible_facts.distribution_major_version | default(0) | int) < 8) | ternary('libselinux-python','python3-libselinux') }}" - device-mapper-libs - ebtables - nss