Alexandros Kosiaris has submitted this change and it was merged.
Change subject: puppet-merge: run conftool after having merged on all the other
hosts
......................................................................
puppet-merge: run conftool after having merged on all the other hosts
No reason to delay the puppet run.
Change-Id: I5b15f30f7276b56ec8d316e6c0a5cec6589a336c
---
M modules/puppetmaster/templates/puppet-merge.erb
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/templates/puppet-merge.erb
b/modules/puppetmaster/templates/puppet-merge.erb
index 3a40ae9..871de86 100755
--- a/modules/puppetmaster/templates/puppet-merge.erb
+++ b/modules/puppetmaster/templates/puppet-merge.erb
@@ -179,11 +179,6 @@
fi
<%- if @servers.has_key?(@fqdn) -%>
-# conftool-merge does need to run from >1 frontend, avoid running a second time
-if [ $running_user != $git_user ]; then
- echo "Now running conftool-merge to sync any changes to conftool data"
- /usr/local/bin/conftool-merge
-fi
# Note: The "true" command is passed on purpose to show that the command passed
# to the SSH sessions is irrelevant. It's the SSH forced command trick on the
# worker end that does the actual work. Note that the $sha1 however is
important
@@ -201,4 +196,9 @@
fi
<%- end -%>
<%- end -%>
+# conftool-merge does need to run from >1 frontend, avoid running a second time
+if [ $running_user != $git_user ]; then
+ echo "Now running conftool-merge to sync any changes to conftool data"
+ /usr/local/bin/conftool-merge
+fi
<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/312193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b15f30f7276b56ec8d316e6c0a5cec6589a336c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
