From d0d28ee504f4a6f69d21332d491cac3b46fb15ce Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben.roberts@gsacapital.com>
Date: Mon, 4 Jul 2022 10:31:38 +0100
Subject: [PATCH] Add EL8 support and claim compatibility

---
 data/os/RedHat/8.yaml         |  3 +++
 metadata.json                 |  3 ++-
 spec/classes/corosync_spec.rb | 27 +++++++++++++++++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 data/os/RedHat/8.yaml

diff --git a/data/os/RedHat/8.yaml b/data/os/RedHat/8.yaml
new file mode 100644
index 00000000..cd198055
--- /dev/null
+++ b/data/os/RedHat/8.yaml
@@ -0,0 +1,3 @@
+---
+corosync::config_validate_cmd: "/usr/sbin/corosync -c % -t"
+
diff --git a/metadata.json b/metadata.json
index 3061a670..b80dbf46 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,7 +11,8 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/spec/classes/corosync_spec.rb b/spec/classes/corosync_spec.rb
index ea87f527..42ef054b 100644
--- a/spec/classes/corosync_spec.rb
+++ b/spec/classes/corosync_spec.rb
@@ -15,12 +15,6 @@
       )
     end
 
-    it 'validates the corosync configuration' do
-      is_expected.to contain_file('/etc/corosync/corosync.conf').with_validate_cmd(
-        '/usr/bin/env COROSYNC_MAIN_CONFIG_FILE=% /usr/sbin/corosync -t'
-      )
-    end
-
     context 'validates the corosncy configuration when config_validate_cmd is set' do
       let(:params) do
         super().merge(
@@ -725,6 +719,27 @@
 
       it_configures 'corosync'
 
+      # Check the correct validation command is used for each OS
+      it 'validates the corosync configuration' do
+        case os_facts[:os]['family']
+        when 'RedHat'
+          case os_facts[:os]['release']['major']
+          when '8'
+            is_expected.to contain_file('/etc/corosync/corosync.conf').with_validate_cmd(
+              '/usr/sbin/corosync -c % -t'
+            )
+          else
+            is_expected.to contain_file('/etc/corosync/corosync.conf').with_validate_cmd(
+              '/usr/bin/env COROSYNC_MAIN_CONFIG_FILE=% /usr/sbin/corosync -t'
+            )
+          end
+        else
+          is_expected.to contain_file('/etc/corosync/corosync.conf').with_validate_cmd(
+            '/usr/bin/env COROSYNC_MAIN_CONFIG_FILE=% /usr/sbin/corosync -t'
+          )
+        end
+      end
+
       # Check default package installations per platform
       case os_facts[:os]['family']
       when 'RedHat'