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
Move configplan variable out of defaults.yaml
[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 a4d4cb0031aa9adf7618ae1391964164e477eb56..95c26c47c9100be49ed0805999d9afe5b469654c 100644
(file)
--- a/
jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/
jjb/integration/integration-deploy-openstack-run-test.sh
@@
-459,22
+459,26
@@
EOF
global
daemon
group haproxy
global
daemon
group haproxy
- log /dev/log local0
+ log /dev/log local0
debug
maxconn 20480
pidfile /tmp/haproxy.pid
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
log global
user haproxy
defaults
log global
+ option log-health-checks
maxconn 4096
mode tcp
retries 3
timeout http-request 10s
maxconn 4096
mode tcp
retries 3
timeout http-request 10s
- timeout queue 1m
- timeout connect 10s
- timeout client 1m
- timeout server 1m
- timeout check 10s
+ timeout queue 2m
+ timeout connect 5s
+ timeout client 5s
+ timeout server 5s
listen opendaylight
bind ${haproxy_ip}:8181 transparent
listen opendaylight
bind ${haproxy_ip}:8181 transparent
@@
-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
@@
-497,16
+500,14
@@
EOF
listen opendaylight_ws
bind ${haproxy_ip}:8185 transparent
mode http
listen opendaylight_ws
bind ${haproxy_ip}:8185 transparent
mode http
- timeout connect 5s
- timeout client 25s
- timeout server 25s
timeout tunnel 3600s
timeout tunnel 3600s
- balance source
+ option httpchk GET /data-change-event-subscription/neutron:neutron/neutron:ports/datastore=OPERATIONAL/scope=SUBTREE HTTP/1.1\r\nHost:\ ws.opendaylight.org\r\nConnection:\ Upgrade\r\nUpgrade:\ websocket\r\nSec-WebSocket-Key:\ haproxy\r\nSec-WebSocket-Version:\ 13\r\nSec-WebSocket-Protocol:\ echo-protocol
+ http-check expect status 101
EOF
odlindex=1
for odlip in ${odl_ips[*]}; do
EOF
odlindex=1
for odlip in ${odl_ips[*]}; do
- echo " server opendaylight-ws-${odlindex} ${odlip}:8185 check fall
5 inter 2
000 rise 2" >> ${WORKSPACE}/haproxy.cfg
+ echo " server opendaylight-ws-${odlindex} ${odlip}:8185 check fall
3 inter 1
000 rise 2" >> ${WORKSPACE}/haproxy.cfg
odlindex=$((odlindex+1))
done
odlindex=$((odlindex+1))
done
@@
-1199,6
+1200,7
@@
for suite in ${SUITES}; do
-v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_1_IP} \
-v TOOLS_SYSTEM_1_IP:${TOOLS_SYSTEM_1_IP} \
-v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \
-v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_1_IP} \
-v TOOLS_SYSTEM_1_IP:${TOOLS_SYSTEM_1_IP} \
-v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \
+ -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
-v USER_HOME:${HOME} \
-v WORKSPACE:/tmp \
${TESTOPTIONS} ${suite} || true
-v USER_HOME:${HOME} \
-v WORKSPACE:/tmp \
${TESTOPTIONS} ${suite} || true