Skip to content

Commit

Permalink
Merge pull request #18539 from knobunc/bug/bz1542612-fix-reload-detec…
Browse files Browse the repository at this point in the history
…tion

Automatic merge from submit-queue (batch tested with PRs 18423, 18255, 18526, 18539, 18509).

Change the haproxy reload detection to tolerate routes named localhost

This changes the reload-haproxy script to explicitly pass no hostname in the http headers so that if a route is created named 'localhost' the reload does not match that route.

Fixes bug 1542612 (https://bugzilla.redhat.com/show_bug.cgi?id=1542612)
  • Loading branch information
openshift-merge-robot authored Feb 9, 2018
2 parents 9d21ef3 + 14191df commit e040f08
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion images/router/haproxy/reload-haproxy
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function haproxyHealthCheck() {

echo " - Checking ${url} ..."
while true; do
local httpcode=$(curl $timeout_opts -s -o /dev/null -I -w "%{http_code}" ${url})
local httpcode=$(curl $timeout_opts -s -o /dev/null -I -H "Host: " -w "%{http_code}" ${url})

if [ "$httpcode" == "503" ]; then
echo " - Health check ok : $retries retry attempt(s)."
Expand Down

0 comments on commit e040f08

Please sign in to comment.