From 1bebad4d419e42c325abbd0dddb0c587a1706385 Mon Sep 17 00:00:00 2001 From: Tal Rosenzweig Date: Wed, 9 Nov 2016 16:53:30 +0200 Subject: [PATCH] fix L3 regression for new-netvirt CSIT with stable/mitaka Fix regression in CSIT, introduced by changes to devstack local.conf [1] while adding networking-odl_v2 support. The router still needs to be explicitly configured in mitaka, in later versions it is automatically configured. [1] https://git.opendaylight.org/gerrit/#/c/46871/ Change-Id: Id77a8e4fb6f3af57c6c5fd0ce094a6238cf5bfa2 Signed-off-by: Tal Rosenzweig --- .../include-raw-integration-deploy-openstack-run-test.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index cf3605724..780df9768 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -65,6 +65,15 @@ ODL_MODE=externalodl LIBVIRT_TYPE=qemu EOF + +if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then +cat >> ${local_conf_file_name} << EOF +[[post-config|\$NEUTRON_CONF]] +[DEFAULT] +service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin +EOF +fi + if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then echo "ODL_V2DRIVER=True" >> ${local_conf_file_name} fi -- 2.36.6