From c0e2e1dbe90764eaa51cbf7665b0192e25186ce4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Thu, 7 Nov 2019 12:36:07 +0000
Subject: [PATCH] basessh: fix up check for libselinux python OS version chceks

---
 roles/basessh/tasks/main.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/roles/basessh/tasks/main.yml b/roles/basessh/tasks/main.yml
index 95171e3fd6..fb74e40c7c 100644
--- a/roles/basessh/tasks/main.yml
+++ b/roles/basessh/tasks/main.yml
@@ -33,7 +33,7 @@
   - config
   - sshd
   - selinux
-  when: ( ansible_distribution_major_version|int < 30 and ansible_distribution == 'Fedora') or ( ansible_distribution == 'RedHat' and ansible_distribution_major_version|int < 8 )
+  when: ( ansible_distribution == 'Fedora' and ansible_distribution_major_version|int < 30 ) or ( ansible_distribution == 'RedHat' and ansible_distribution_major_version|int < 8 )
 
 - name: make sure python3-libselinux is installed
   package: name=python3-libselinux state=present
@@ -43,17 +43,7 @@
   - config
   - sshd
   - selinux
-  when: ansible_distribution_major_version|int >= 30 and ansible_distribution == 'Fedora' or ( ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 )
-
-- name: make sure python3-libselinux is installed
-  package: name=python3-libselinux state=present
-  tags:
-  - basessh
-  - sshd_config
-  - config
-  - sshd
-  - selinux
-  when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat'
+  when: ( ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 30 ) or ( ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 )
 
 - name: check if sshd port is already known by selinux
   shell: semanage port -l | grep ssh