X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Fservice.pp;h=c01aa64ad35fcefda4f6e4be1273d666dba3b1d8;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=6afe71e63f3919657d3618ccfc0335b027fea417;hpb=c7e7bcc28cc5dc48a7e284a3c82f33df27d1f57d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/manifests/service.pp b/3rdparty/modules/rabbitmq/manifests/service.pp
index 6afe71e63..c01aa64ad 100644
--- a/3rdparty/modules/rabbitmq/manifests/service.pp
+++ b/3rdparty/modules/rabbitmq/manifests/service.pp
@@ -11,11 +11,14 @@
 # Sample Usage:
 #
 class rabbitmq::service(
-  Enum['running', 'stopped'] $service_ensure  = $rabbitmq::service_ensure,
-  Boolean $service_manage                     = $rabbitmq::service_manage,
-  $service_name                               = $rabbitmq::service_name,
+  $service_ensure = $rabbitmq::service_ensure,
+  $service_manage = $rabbitmq::service_manage,
+  $service_name   = $rabbitmq::service_name,
 ) inherits rabbitmq {
 
+  validate_re($service_ensure, '^(running|stopped)$')
+  validate_bool($service_manage)
+
   if ($service_manage) {
     if $service_ensure == 'running' {
       $ensure_real = 'running'
@@ -32,10 +35,6 @@ class rabbitmq::service(
       hasrestart => true,
       name       => $service_name,
     }
-
-    if $facts['systemd'] {
-      Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server']
-    }
   }
 
 }