ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261349
Change subject: restart of salt minion should not kill all subprocesses
......................................................................
restart of salt minion should not kill all subprocesses
this fixes a problem with installs on jessie which used to leave
salt minion upgrades run via salt from the master in a broken
half-installed state.
Change-Id: I39494dc6e3897a0eb6b576850b42db2f7c162b1b
---
M modules/salt/manifests/minion.pp
1 file changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/261349/1
diff --git a/modules/salt/manifests/minion.pp b/modules/salt/manifests/minion.pp
index d186c9f..6c5a6dc 100644
--- a/modules/salt/manifests/minion.pp
+++ b/modules/salt/manifests/minion.pp
@@ -61,8 +61,9 @@
# step which automatically starts the minion
# will start it with the correct settings
package { 'salt-minion':
- ensure => present,
- require => File['/etc/salt/minion'],
+ ensure => present,
+ require => File['/etc/salt/minion',
+ '/etc/systemd/system/salt-minion.service.d/'],
}
service { 'salt-minion':
@@ -116,4 +117,19 @@
mode => '0444',
}
+ if $::initsystem == 'systemd' {
+ file { '/etc/systemd/system/salt-minion.service.d/':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+
+ file { '/etc/systemd/system/salt-minion.service.d/killmode.conf':
+ content => '[Service]\nKillMode=process\n',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/261349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39494dc6e3897a0eb6b576850b42db2f7c162b1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
