Skip to content

Commit 3d47832

Browse files
committed
Also perform systemd daemon-reload on Puppet 6.1+
The way daemon-reload is implemented in Puppet 6.1 is by calling systemctl show --property=NeedDaemonReload -- $SERVICE If that returns yes then it performs systemctl daemon-reload. However, this doesn't work reliable because of the particular case. # systemctl show --property=NeedDaemonReload -- postgresql Failed to get properties: Access denied This is probably because the original unit file is removed.
1 parent 3c6e00e commit 3d47832

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

manifests/server/config.pp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,25 +224,25 @@
224224
# - $datadir
225225
# - @extra_systemd_config
226226

227-
if (versioncmp($facts['puppetversion'], '6.1.0') < 0) {
228-
exec { 'restart-systemd':
229-
command => 'systemctl daemon-reload',
230-
refreshonly => true,
231-
path => '/bin:/usr/bin:/usr/local/bin',
232-
before => Class['postgresql::server::service'],
233-
}
234-
$systemd_notify = [Exec['restart-systemd'], Class['postgresql::server::service']]
235-
}
236-
else {
237-
$systemd_notify = Class['postgresql::server::service']
227+
# While Puppet 6.1 and newer can do a daemon-reload if needed, systemd
228+
# doesn't appear to report that correctly. This is probably because its
229+
# unit file is actually removed.
230+
#
231+
# This can be removed when Puppet < 6.1 support is dropped *and* the file
232+
# old-systemd-override is removed.
233+
exec { 'restart-systemd':
234+
command => 'systemctl daemon-reload',
235+
refreshonly => true,
236+
path => '/bin:/usr/bin:/usr/local/bin',
237+
before => Class['postgresql::server::service'],
238238
}
239239

240240
file {
241241
default:
242242
ensure => file,
243243
owner => root,
244244
group => root,
245-
notify => $systemd_notify,
245+
notify => [Exec['restart-systemd'], Class['postgresql::server::service']],
246246
before => Class['postgresql::server::reload'],
247247

248248
;

0 commit comments

Comments
 (0)