Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399377 )
Change subject: haproxy: Add workaround for ferm starting too late
......................................................................
haproxy: Add workaround for ferm starting too late
Without this, haproxy starts on reboot with monitored servers going
DOWN.
This should be removed ASAP- it adds unnecesary time to a potential
outage, if it has to be restarted.
Bug: T148986
Change-Id: I92d286d2e7efb49df7ab9d3f69364e557e8a11ae
---
M modules/haproxy/templates/haproxy.service.erb
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/haproxy/templates/haproxy.service.erb
b/modules/haproxy/templates/haproxy.service.erb
index f8cd99e..e2036c8 100644
--- a/modules/haproxy/templates/haproxy.service.erb
+++ b/modules/haproxy/templates/haproxy.service.erb
@@ -8,6 +8,8 @@
[Service]
Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=<%=@pid%>"
EnvironmentFile=-/etc/default/haproxy
+# Workaround for T166653, T148986#3850797
+ExecStartPre=/bin/sleep 5
ExecStartPre=/usr/local/bin/generate_haproxy_default.sh
ExecStartPre=/usr/sbin/haproxy -f ${CONFIG} -c -q $EXTRAOPTS
ExecStart=/usr/sbin/haproxy-systemd-wrapper -f ${CONFIG} -p $PIDFILE $EXTRAOPTS
--
To view, visit https://gerrit.wikimedia.org/r/399377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92d286d2e7efb49df7ab9d3f69364e557e8a11ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
