Skip to content

Commit

Permalink
Drop workaround for Puppet 5
Browse files Browse the repository at this point in the history
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] voxpupuli/puppet-systemd@2ed469f
  • Loading branch information
kajinamit committed Oct 5, 2024
1 parent 6c854f8 commit c45b288
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions manifests/instance.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}
}

Expand Down

0 comments on commit c45b288

Please sign in to comment.