]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Add support for Amazon Linux 2
authorErik Geiger <erik@frontify.com>
Fri, 3 Aug 2018 14:41:29 +0000 (16:41 +0200)
committerErik Geiger <erik@frontify.com>
Wed, 8 Aug 2018 12:01:37 +0000 (14:01 +0200)
setting service provider explicit to systemd as pupppets default does
not work for Amazon Linux 2

manifests/linux/redhat.pp

index 5002bb4060ab5ac01e09c46bcb321214418e395b..eacf4d917faa6ae6f3fcd62d4ba4b49e5166cebf 100644 (file)
@@ -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}":