Pyoungmeister has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56073
Change subject: add more aggressive killing to puppet for precise
......................................................................
add more aggressive killing to puppet for precise
the lucid pacakges version doesn't support any args, but puppet
keeps getting stuck on various boxes and requiring a -9. this
should clear that up
Change-Id: I65568c6f5b67cc48e729b53be257a7b0bb438f45
---
M templates/base/puppet.cron.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/56073/1
diff --git a/templates/base/puppet.cron.erb b/templates/base/puppet.cron.erb
index d7e89d7..2264138 100644
--- a/templates/base/puppet.cron.erb
+++ b/templates/base/puppet.cron.erb
@@ -1,5 +1,5 @@
## This file is managed by Puppet!
## templates/base/puppet.cron.erb
<% $crontime = scope.lookupvar('base::puppet::crontime') -%>
-<%= $crontime %>,<%= $crontime.to_i + 30 %> * * * *
root timeout 1800 puppet agent --onetime --verbose --no-daemonize --no-splay
--show_diff >> /var/log/puppet.log 2>&1
-@reboot root timeout 1800 puppet agent --onetime --verbose
--no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1
+<%= $crontime %>,<%= $crontime.to_i + 30 %> * * * *
root timeout <% if scope.function_versioncmp(lsbdistrelease, "12.04") >= 0
%> -k 300 -s 9<% end %> 1800 puppet agent --onetime --verbose --no-daemonize
--no-splay --show_diff >> /var/log/puppet.log 2>&1
+@reboot root timeout <% if scope.function_versioncmp(lsbdistrelease,
"12.04") >= 0 %> -k 300 -s 9<% end %> 1800 puppet agent --onetime --verbose
--no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1
--
To view, visit https://gerrit.wikimedia.org/r/56073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65568c6f5b67cc48e729b53be257a7b0bb438f45
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
