RHEL 8 support

.bundle/config

@@ -1,6 +1,6 @@
 ---
 BUNDLE_JOBS: "4"
-BUNDLE_PATH: "vendor/bundle"
+BUNDLE_PATH: ".vendor/bundle"
 BUNDLE_DISABLE_SHARED_GEMS: "true"
-BUNDLE_WITHOUT: "system_tests"
 BUNDLE_BUILD: "--no-ri --no-rdoc"
+BUNDLE_WITHOUT: "system_tests"

Gemfile

@@ -77,7 +77,7 @@ end
 gem 'puppetlabs_spec_helper', '>= 2.0'
 gem 'puppet-lint', '>= 2.0.0'
 gem 'facter', '>= 2.4.0'
-gem 'facterdb', '>= 0.5'
+gem 'facterdb', '>= 1.0.0'
 gem 'rspec-puppet-facts', '>= 1.6.0'
 gem 'serverspec'
 gem 'r10k'
@@ -87,4 +87,4 @@ gem 'beaker-rspec'
 gem 'beaker-vagrant'
 gem 'beaker-puppet_install_helper'
 
-# vim: syntax=ruby
+# vim: syntax=ruby

examples/init_repo.pp

@@ -4,12 +4,6 @@
   } # RedHat
 }
 
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 class { 'icinga2':
   manage_repo => true,
 }

metadata.json

@@ -30,21 +30,24 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {

spec/acceptance/class_spec.rb

@@ -5,10 +5,8 @@
   describe 'with API, IDO mysql and pgsql' do
     let(:pp) do
       <<-MANIFEST
-        case $::osfamily {
-          'redhat': {
+        if $facts['os']['name'] == 'centos' and Integer($facts['os']['release']['major']) < 8 {
             package { 'epel-release': }
-          } # RedHat
         }
         class { 'icinga2':
           manage_repo => true,
@@ -63,8 +61,11 @@ class { 'icinga2::feature::api':
     end
 
     describe service('icinga2') do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_running }
+    end
+
+    describe port(5665) do
+      it { is_expected.to be_listening }
     end
 
     describe command("mysql icinga2 -Ns -e 'select version from icinga_dbversion;'") do

spec/acceptance/nodesets/centos-8-x64.yml

@@ -0,0 +1,12 @@
+---
+HOSTS:
+  i2centos8:
+    roles:
+      - agent
+      - default
+    platform: el-8-x86_64
+    hypervisor: vagrant
+    box: bento/centos-8
+    vagrant_memsize: 1024
+CONFIG:
+  type: aio