From 2d1c1c163ca66eb1c3634edc157a9ac183537c8a Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Jul 31 2018 15:24:00 +0000
Subject: Add YUM 4 based OS.


Signed-off-by: Andrei Stepanov <astepano@redhat.com>

---

diff --git a/roles/str-common-init/tasks/inspect.yml b/roles/str-common-init/tasks/inspect.yml
index 20b1494..1cfcc1f 100644
--- a/roles/str-common-init/tasks/inspect.yml
+++ b/roles/str-common-init/tasks/inspect.yml
@@ -21,8 +21,8 @@
       {{ ansible_pkg_mgr == 'dnf' }}
     is_rhel8_based: >-
       {{
-          ( ['ansible_distribution'] |
-          intersect(['RedHat', 'CentOS']) | bool ) and
+          ( [ansible_distribution] |
+          intersect(['RedHat', 'CentOS']) | length | bool ) and
           ansible_distribution_version|int == 8
       }}
 
diff --git a/roles/str-common-pkgs/tasks/inspect.yml b/roles/str-common-pkgs/tasks/inspect.yml
index 20b1494..1cfcc1f 100644
--- a/roles/str-common-pkgs/tasks/inspect.yml
+++ b/roles/str-common-pkgs/tasks/inspect.yml
@@ -21,8 +21,8 @@
       {{ ansible_pkg_mgr == 'dnf' }}
     is_rhel8_based: >-
       {{
-          ( ['ansible_distribution'] |
-          intersect(['RedHat', 'CentOS']) | bool ) and
+          ( [ansible_distribution] |
+          intersect(['RedHat', 'CentOS']) | length | bool ) and
           ansible_distribution_version|int == 8
       }}
 
diff --git a/roles/str-common-pkgs/tasks/main.yml b/roles/str-common-pkgs/tasks/main.yml
index 6852766..ac2f673 100644
--- a/roles/str-common-pkgs/tasks/main.yml
+++ b/roles/str-common-pkgs/tasks/main.yml
@@ -21,7 +21,9 @@
       {{
          'rpm-ostree' if (is_atomic and
                              (ansible_pkg_mgr == 'unknown' or
-                              ansible_pkg_mgr == 'atomic_container')) else ansible_pkg_mgr
+                              ansible_pkg_mgr == 'atomic_container'))
+         else 'yum4' if is_rhel8_based
+         else ansible_pkg_mgr
       }}
 
 - debug: