Merge "Update global haproxy to match OOO"

diff --combined jjb/integration/integration-deploy-openstack-run-test.sh
index a4d4cb0031aa9adf7618ae1391964164e477eb56,0009eeb9d3d15c5bd4ef4735c68ece87f5def558..4f211e022e43cd04836cd2933dcfdb289e9c7e88
--- 1/jjb/integration/integration-deploy-openstack-run-test.sh
--- 2/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@@ -462,6 -462,10 +462,10 @@@ globa
    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
@@@ -470,10 -474,10 +474,10 @@@
    mode  tcp
    retries  3
    timeout  http-request 10s
-   timeout  queue 1m
+   timeout  queue 2m
    timeout  connect 10s
-   timeout  client 1m
-   timeout  server 1m
+   timeout  client 2m
+   timeout  server 2m
    timeout  check 10s
  
  listen opendaylight
@@@ -483,7 -487,6 +487,6 @@@
    http-request set-header X-Forwarded-Proto http if !{ ssl_fc }
    option httpchk GET /diagstatus
    option httplog
-   balance source
  EOF
  
      odlindex=1
@@@ -501,7 -504,6 +504,6 @@@ listen opendaylight_w
    timeout client 25s
    timeout server 25s
    timeout tunnel 3600s
-   balance source
  EOF
  
      odlindex=1
@@@ -826,11 -828,6 +828,11 @@@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL
          setup_live_migration_compute ${!CONTROLIP} ${!CONTROLIP}
      fi
      [ -n "${OVS_INSTALL}" ] && install_ovs ${!CONTROLIP} /tmp/ovs_rpms
 +    if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
 +        # This should be really done by networking-odl devstack plugin,
 +        # but in the meantime do it ourselves
 +        ssh ${!CONTROLIP} "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
 +    fi
      echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
      ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
      ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
@@@ -881,11 -878,6 +883,11 @@@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE
      install_rdo_release ${!COMPUTEIP}
      setup_live_migration_compute ${!COMPUTEIP} ${!CONTROLIP}
      [ -n "${OVS_INSTALL}" ] && install_ovs ${!COMPUTEIP} /tmp/ovs_rpms
 +    if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
 +        # This should be really done by networking-odl devstack plugin,
 +        # but in the meantime do it ourselves
 +        ssh ${!COMPUTEIP} "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
 +    fi
      echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
      ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
      ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"