Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364748 )
Change subject: puppet: add --no-splay ...................................................................... puppet: add --no-splay As we moved the splay outside of puppet, we need to tell puppet explicitly we do NOT want splay to happen, or we will make things way worse than before. Change-Id: I91853d3c41fbe55e8a747594fae6629688dc64c4 --- M modules/base/templates/puppet-run.erb 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved Volans: Looks good to me, but someone else must approve diff --git a/modules/base/templates/puppet-run.erb b/modules/base/templates/puppet-run.erb old mode 100644 new mode 100755 index 5e89d7b..942ece9 --- a/modules/base/templates/puppet-run.erb +++ b/modules/base/templates/puppet-run.erb @@ -64,4 +64,5 @@ --no-daemonize \ --verbose \ --show_diff \ + --no-splay \ >> /var/log/puppet.log 2>&1 -- To view, visit https://gerrit.wikimedia.org/r/364748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91853d3c41fbe55e8a747594fae6629688dc64c4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Volans <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
