Remove private repo for networking-l2gw plugin 84/68884/1
authorVictor Pickard <vpickard@redhat.com>
Wed, 28 Feb 2018 15:15:07 +0000 (10:15 -0500)
committerVictor Pickard <vpickard@redhat.com>
Wed, 28 Feb 2018 15:15:07 +0000 (10:15 -0500)
Patch has been merged, remove the private repo.

Change-Id: I8777d2df0db50d64bd10cad48b8cc1397ca3cbee
Signed-off-by: Victor Pickard <vpickard@redhat.com>
jjb/integration/integration-deploy-openstack-run-test.sh

index 7946add9ac9014c097cbeea1aa8f95ff582930f2..ae9d1f7f4bc35916d591729462a91edfc13dac3d 100644 (file)
@@ -277,9 +277,7 @@ EOF
     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