From: Sam Hague Date: Mon, 22 Oct 2018 22:01:36 +0000 (+0000) Subject: Merge "Use source LB instead of default round-robin" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e18f39bb538317ab06d25e5c3965e4872e69e062;hp=8508b57996883c89d33722acffe2d274634c4ddf;p=releng%2Fbuilder.git Merge "Use source LB instead of default round-robin" --- diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index ecdae70c7..d9d9c3dbe 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -484,6 +484,7 @@ defaults listen opendaylight bind ${haproxy_ip}:8181 transparent mode http + balance source http-request set-header X-Forwarded-Proto https if { ssl_fc } http-request set-header X-Forwarded-Proto http if !{ ssl_fc } option httpchk GET /diagstatus @@ -501,6 +502,7 @@ EOF listen opendaylight_ws bind ${haproxy_ip}:8185 transparent mode http + balance source timeout connect 5s timeout client 25s timeout server 25s