ArielGlenn has submitted this change and it was merged.
Change subject: run puppet once an hour instead of every half hour
......................................................................
run puppet once an hour instead of every half hour
This is a stopgap measure; we have many many hosts failing
puppet runs on one or more steps due to timeout. This will
hopefully tide us over til we can scale out stafford (puppetmaster).
Change-Id: I36ad66c460d9cb3663d93ba95ecf38b5f1f501f8
---
M modules/base/manifests/init.pp
M modules/base/templates/puppet.cron.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index e5b6a70..684c93b 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -191,7 +191,7 @@
## run puppet by cron and
## rotate puppet logs generated by cron
- $crontime = fqdn_rand(30)
+ $crontime = fqdn_rand(60)
file {
"/etc/cron.d/puppet":
diff --git a/modules/base/templates/puppet.cron.erb
b/modules/base/templates/puppet.cron.erb
index 4450ed0..0af8f39 100644
--- a/modules/base/templates/puppet.cron.erb
+++ b/modules/base/templates/puppet.cron.erb
@@ -3,5 +3,5 @@
##### as template('base/puppet.cron.erb')
######################################################################
<% $crontime = scope.lookupvar('base::puppet::crontime') -%>
-<%= $crontime %>,<%= $crontime.to_i + 30 %> * * * *
root timeout <% if scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0
%> -k 300<% end %> 1800 puppet agent --onetime --verbose --no-daemonize
--no-splay --show_diff >> /var/log/puppet.log 2>&1
+<%= $crontime %> * * * * root timeout <% if
scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0 %> -k 300<% 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<% 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/89235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36ad66c460d9cb3663d93ba95ecf38b5f1f501f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
