Skip to content

Commit 9cdc862

Browse files
authored
Drop workaround for Puppet 5 (#172)
Remove 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] voxpupuli/puppet-systemd@2ed469f
1 parent 6c854f8 commit 9cdc862

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

manifests/instance.pp

-11
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,10 @@
5050
if $override_content and $override_source {
5151
fail('memcached::instance: you can only set override_content OR override_source, dont set both')
5252
}
53-
# manually reload systemd to make puppet 5 users happy.
54-
# puppet 6 and newer are reloading systemd properly
5553
systemd::dropin_file { "${service_name}-override.conf":
5654
unit => $service_name,
5755
source => $override_source,
5856
content => $override_content,
59-
notify => Exec["${service_name}_force_systemd_reload"],
60-
}
61-
62-
exec { "${service_name}_force_systemd_reload":
63-
command => 'systemctl daemon-reload',
64-
user => 'root',
65-
path => ['/sbin', '/bin', '/usr/sbin', '/usr/bin'],
66-
refreshonly => true,
67-
notify => Service[$service_name],
6857
}
6958
}
7059

0 commit comments

Comments
 (0)