From: Erik Geiger <erik@frontify.com>
Date: Fri, 3 Aug 2018 14:41:29 +0000 (+0200)
Subject: Add support for Amazon Linux 2
X-Git-Tag: 1.13.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1a9215cbc4e44eca1cc7334a42091e5825e90bb4;p=puppet-modules%2Fpuppetlabs-firewall.git

Add support for Amazon Linux 2

setting service provider explicit to systemd as pupppets default does
not work for Amazon Linux 2
---

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index 5002bb4..eacf4d9 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -67,15 +67,30 @@ class firewall::linux::redhat (
     }
   }
 
-  service { $service_name:
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-  service { $service_name_v6:
-    ensure    => $_ensure_v6,
-    enable    => $_enable_v6,
-    hasstatus => true,
+  if ($::operatingsystem == 'Amazon') and (versioncmp($::operatingsystemmajrelease, '4') >= 0) {
+    service { $service_name:
+      ensure    => $ensure,
+      enable    => $enable,
+      hasstatus => true,
+      provider  => systemd,
+    }
+    service { $service_name_v6:
+      ensure    => $_ensure_v6,
+      enable    => $_enable_v6,
+      hasstatus => true,
+      provider  => systemd,
+    }
+  } else {
+    service { $service_name:
+      ensure    => $ensure,
+      enable    => $enable,
+      hasstatus => true,
+    }
+    service { $service_name_v6:
+      ensure    => $_ensure_v6,
+      enable    => $_enable_v6,
+      hasstatus => true,
+    }
   }
 
   file { "/etc/sysconfig/${service_name}":