new style for 2.7

2 files changed, 10 insertions, 14 deletions

diff --git a/manifests/service/ntp.pp b/manifests/service/ntp.pp
index eca255a..b3cde2a 100644
--- a/manifests/service/ntp.pp
+++ b/manifests/service/ntp.pp
@@ -1,9 +1,9 @@
 # manifests/service/ntp.pp
 
 class nagios::service::ntp {
-    nagios::service{ "check_ntp":
-        check_command => "check_ntp_time",
-        host_name => $fqdn,
-    }
+  nagios::service{ "check_ntp":
+    check_command => "check_ntp_time",
+    host_name => $::fqdn,
+  }
 }
 
diff --git a/manifests/service/ping.pp b/manifests/service/ping.pp
index c705c68..80f2114 100644
--- a/manifests/service/ping.pp
+++ b/manifests/service/ping.pp
@@ -1,13 +1,9 @@
 define nagios::service::ping(
-    $ensure = present
+    $ensure = present,
+    $ping_rate = hiera('nagios_ping_rate','!100.0,20%!500.0,60%')
 ){
-    $real_nagios_ping_rate = $nagios_ping_rate ? {
-        '' => '!100.0,20%!500.0,60%',
-        default => $nagios_ping_rate
-    }
-
-    nagios::service{ "check_ping":
-        ensure => $ensure,
-        check_command => "check_ping${real_nagios_ping_rate}",
-    }
+  nagios::service{ "check_ping":
+    ensure => $ensure,
+    check_command => "check_ping${ping_rate}",
+  }
 }