Merge "Remove private repo for networking-l2gw plugin"

diff --combined jjb/integration/integration-deploy-openstack-run-test.sh
index 85adfe8e075b6ea48bc1b8e4a045adf255dc1414,ae9d1f7f4bc35916d591729462a91edfc13dac3d..7d5fd0db6c31145cbbbdeea1ada4e7a30292c434
--- 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
@@@ -277,9 -277,7 +277,7 @@@ EO
      if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
          cat >> ${local_conf_file_name} << EOF
  
- #enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
- # Need this until patch https://review.openstack.org/#/c/546994/2 is merged
- enable_plugin networking-l2gw https://github.com/vpickard/networking-l2gw queens-pluginFix
+ enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
  NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
  EOF
      fi
@@@ -362,7 -360,7 +360,7 @@@ EO
  
      cat >> ${local_conf_file_name} << EOF
  #Added to make Nova wait until nova in control node is ready.
 -NOVA_READY_TIMEOUT=900
 +NOVA_READY_TIMEOUT=1800
  HOST_IP=${HOSTIP}
  SERVICE_HOST=${SERVICEHOST}
  Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE}