Compatibility with camptocamp/systemd 3.x (voxpupuli#886)

* call systemd::systemctl::daemon_reload only if it is defined systemd::systemctl::daemon_reload was removed in camptocamp-systemd 3.0.0 (Also change to use puppet systemd module) (cherry picked from commit 0514e4a) Change-Id: I33c75bbf8967d4461c0037215d2cacacf9b8788a
NeCTAR-RC · Sep 20, 2021 · 095bca9 · 095bca9
1 parent 98e9065
commit 095bca9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -23,8 +23,7 @@
       hasrestart => true,
       name       => $service_name,
     }
-
-    if $facts['systemd'] {
+    if $facts['systemd'] and defined(Class['systemd::systemctl::daemon_reload']) {
       Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server']
     }
   }

diff --git a/metadata.json b/metadata.json
@@ -69,8 +69,8 @@
       "version_requirement": ">= 2.0.0 < 4.0.0"
     },
     {
-      "name": "camptocamp/systemd",
-      "version_requirement": ">= 2.1.0 < 3.0.0"
+      "name": "puppet/systemd",
+      "version_requirement": ">= 2.10.0 < 4.0.0"
     }
   ],
   "tags": [