From 3120d7a8416efdf7278a422b368509ba3c0f354a Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Fri, 17 Apr 2020 18:30:50 -0400
Subject: [PATCH] Fixes #29212 - support el8

---
 .sync.yml                                   |  1 +
 .travis.yml                                 | 22 +++++++++++++++++++++
 metadata.json                               |  6 ++++--
 spec/acceptance/foreman_cli_plugins_spec.rb |  4 ++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index d54193f95..9bf868fba 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,6 +2,7 @@
 .travis.yml:
   beaker_sets:
     - centos7-64
+    - centos8-64
     - debian10-64
     - ubuntu1804-64
   env:
diff --git a/.travis.yml b/.travis.yml
index 2e833ba02..747e5d73d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,28 @@ matrix:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
diff --git a/metadata.json b/metadata.json
index 9c2771f1a..59db7c981 100644
--- a/metadata.json
+++ b/metadata.json
@@ -55,13 +55,15 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/spec/acceptance/foreman_cli_plugins_spec.rb b/spec/acceptance/foreman_cli_plugins_spec.rb
index 2bd20f9aa..d1adddc87 100644
--- a/spec/acceptance/foreman_cli_plugins_spec.rb
+++ b/spec/acceptance/foreman_cli_plugins_spec.rb
@@ -11,7 +11,7 @@ class { 'foreman::cli':
       password    => 'changeme',
     }
 
-    if $facts['osfamily'] == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       include foreman::cli::ansible
       include foreman::cli::azure
     }
@@ -27,7 +27,7 @@ class { 'foreman::cli':
   it_behaves_like 'hammer'
 
   ['discovery', 'remote_execution', 'tasks', 'templates'].each do |plugin|
-    package_name = case fact('osfamily')
+    package_name = case fact('os.family')
                    when 'RedHat'
                      fact('operatingsystem') == 'Fedora' ? "rubygem-hammer_cli_foreman_#{plugin}" : "tfm-rubygem-hammer_cli_foreman_#{plugin}"
                    when 'Debian'