Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update global haproxy to match OOO
[releng/builder.git]
/
jjb
/
integration
/
integration-deploy-openstack-run-test.sh
diff --git
a/jjb/integration/integration-deploy-openstack-run-test.sh
b/jjb/integration/integration-deploy-openstack-run-test.sh
index 806790bec838b6ffe9c1bb3d0485bc4e774ac76f..0009eeb9d3d15c5bd4ef4735c68ece87f5def558 100644
(file)
--- a/
jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/
jjb/integration/integration-deploy-openstack-run-test.sh
@@
-462,6
+462,10
@@
global
log /dev/log local0
maxconn 20480
pidfile /tmp/haproxy.pid
log /dev/log local0
maxconn 20480
pidfile /tmp/haproxy.pid
+ ssl-default-bind-ciphers !SSLv2:kEECDH:kRSA:kEDH:kPSK:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES
+ ssl-default-bind-options no-sslv3 no-tlsv10
+ stats socket /var/lib/haproxy/stats mode 600 level user
+ stats timeout 2m
user haproxy
defaults
user haproxy
defaults
@@
-470,10
+474,10
@@
defaults
mode tcp
retries 3
timeout http-request 10s
mode tcp
retries 3
timeout http-request 10s
- timeout queue
1
m
+ timeout queue
2
m
timeout connect 10s
timeout connect 10s
- timeout client
1
m
- timeout server
1
m
+ timeout client
2
m
+ timeout server
2
m
timeout check 10s
listen opendaylight
timeout check 10s
listen opendaylight
@@
-483,7
+487,6
@@
listen opendaylight
http-request set-header X-Forwarded-Proto http if !{ ssl_fc }
option httpchk GET /diagstatus
option httplog
http-request set-header X-Forwarded-Proto http if !{ ssl_fc }
option httpchk GET /diagstatus
option httplog
- balance source
EOF
odlindex=1
EOF
odlindex=1
@@
-501,7
+504,6
@@
listen opendaylight_ws
timeout client 25s
timeout server 25s
timeout tunnel 3600s
timeout client 25s
timeout server 25s
timeout tunnel 3600s
- balance source
EOF
odlindex=1
EOF
odlindex=1