Akosiaris has submitted this change and it was merged.
Change subject: Fix a erroneus check in post-merge
......................................................................
Fix a erroneus check in post-merge
Erroneously checking for $::hostname and not $::fqdn in post-merge hook
Change-Id: I0bc17ad616d9f53d39a4a39281e4a5e956a0b73b
---
M modules/puppetmaster/templates/post-merge.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/templates/post-merge.erb
b/modules/puppetmaster/templates/post-merge.erb
index 6a76908..2c73d98 100644
--- a/modules/puppetmaster/templates/post-merge.erb
+++ b/modules/puppetmaster/templates/post-merge.erb
@@ -13,7 +13,7 @@
<%- if worker == @fqdn then next end -%>
ssh -t -t <%= worker -%> 'cd /var/lib/git/operations/puppet && git pull
&& git submodule update --init'
<%- end -%>
- <%- elsif @hostname == 'sockpuppet.pmtpa.wmnet' -%>
+ <%- elsif @fqdn == 'sockpuppet.pmtpa.wmnet' -%>
# TODO: After migration delete the sockpuppet references
ssh -t -t stafford.pmtpa.wmnet 'cd /var/lib/git/operations/puppet &&
git pull && git submodule update --init'
<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/93507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bc17ad616d9f53d39a4a39281e4a5e956a0b73b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
Gerrit-Reviewer: Akosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
