Pyoungmeister has submitted this change and it was merged.
Change subject: Revert "pulling fqdn_rand into class"
......................................................................
Revert "pulling fqdn_rand into class"
This reverts commit e1feb4810d3e1d1c237056ee99c1bccd6eb9512f
Change-Id: I2cfbf792287a237854fd2e47f79d03deab9f991a
---
M manifests/base.pp
M templates/base/puppet.cron.erb
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Pyoungmeister: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/base.pp b/manifests/base.pp
index a5a3c19..bb63b3d 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -213,8 +213,6 @@
## 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 4283766..5885b01 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/54980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cfbf792287a237854fd2e47f79d03deab9f991a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
