From 4e66fbef06feb3e17fa9b7635512912f756061d5 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Thu, 6 May 2021 10:43:34 +0200 Subject: [PATCH 1/2] Remove systemd-releoad See https://github.com/camptocamp/puppet-systemd/compare/2.12.0...3.0.0#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R224-R229 `systemd::systemctl::daemon_reload` was removed. --- manifests/service.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index f75f107b7..58cc1177c 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -23,8 +23,5 @@ name => $service_name, } - if $facts['systemd'] { - Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server'] - } } } From 73d06949ed5abe64f9ab382ad4a2bd3e52b4135c Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Thu, 6 May 2021 11:32:44 +0200 Subject: [PATCH 2/2] call systemd::systemctl::daemon_reload only if it is defined systemd::systemctl::daemon_reload was removed in camptocamp-systemd 3.0.0 --- manifests/service.pp | 4 +++- metadata.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index 58cc1177c..55c090a66 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -22,6 +22,8 @@ hasrestart => true, name => $service_name, } - + 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 index 5c8fe87c2..6a7db919d 100644 --- a/metadata.json +++ b/metadata.json @@ -68,7 +68,7 @@ }, { "name": "camptocamp/systemd", - "version_requirement": ">= 2.10.0 < 3.0.0" + "version_requirement": ">= 2.10.0 < 4.0.0" } ], "tags": [