From c45b288a91354ffb0456972b3de0abadacd41158 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 5 Oct 2024 19:08:42 +0900 Subject: [PATCH] Drop workaround for Puppet 5 Removes the workaround which manually reload systemd daemons because it is no longer required in all supported Puppet versions. Furthermore the reload command is implemented in puppet-systemd since 3.10.0[1]. [1] https://github.com/voxpupuli/puppet-systemd/commit/2ed469f3097afa1f658f20318de267427478d88d --- manifests/instance.pp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/manifests/instance.pp b/manifests/instance.pp index df2943e..b80fb95 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -50,21 +50,10 @@ if $override_content and $override_source { fail('memcached::instance: you can only set override_content OR override_source, dont set both') } - # manually reload systemd to make puppet 5 users happy. - # puppet 6 and newer are reloading systemd properly systemd::dropin_file { "${service_name}-override.conf": unit => $service_name, source => $override_source, content => $override_content, - notify => Exec["${service_name}_force_systemd_reload"], - } - - exec { "${service_name}_force_systemd_reload": - command => 'systemctl daemon-reload', - user => 'root', - path => ['/sbin', '/bin', '/usr/sbin', '/usr/bin'], - refreshonly => true, - notify => Service[$service_name], } }