Pyoungmeister has submitted this change and it was merged.
Change subject: pulling fqdn_rand into class
......................................................................
pulling fqdn_rand into class
Change-Id: I340c0d1740b01b73f4d4f8d0f5ab54bd36147a3b
---
M manifests/base.pp
M templates/base/puppet.cron.erb
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Pyoungmeister: Verified; Looks good to me, approved
diff --git a/manifests/base.pp b/manifests/base.pp
index bb63b3d..a5a3c19 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -213,6 +213,8 @@
## run puppet by cron and
## rotate puppet logs generated by cron
+ $crontime = fqdn_rand(30)
+
file {
"/etc/cron.d/puppet":
require => File[ [ "/etc/default/puppet" ] ],
diff --git a/templates/base/puppet.cron.erb b/templates/base/puppet.cron.erb
index 5885b01..4283766 100644
--- a/templates/base/puppet.cron.erb
+++ b/templates/base/puppet.cron.erb
@@ -1,4 +1,4 @@
## This file is managed by Puppet!
## templates/base/puppet.cron.erb
-<% $crontime = scope.fqdn_rand(30) %>
+
<%= $crontime %>,<%= $crontime+30 %> * * * * root timeout -k 300 1800 puppet
agent --onetime --verbose --no-daemonize --no-splay --show_diff >>
/var/log/puppet.log 2>&1
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/54977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I340c0d1740b01b73f4d4f8d0f5ab54bd36147a3b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
