netvirt CSIT: fix location of neutron post-config in devstack

Further fix to regression introduced in [1] and attempted to fix
in [2].

[1] https://git.opendaylight.org/gerrit/#/c/46871/
[2] https://git.opendaylight.org/gerrit/#/c/48164/

Change-Id: I70d582ea059b89ea544577290b29b6e758be7851
Signed-off-by: Alon Kochba <alonko@hpe.com>

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 780df97688ce782cc2d65c828efd9b5456520b54..cd9741f570daf865ecd673454f08504ccc198462 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -66,14 +66,6 @@ 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
@@ -123,7 +115,18 @@ ODL_L3=${ODL_L3}
 PUBLIC_INTERFACE=br100
 
 EOF
-fi
+
+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 #check for ODL_ML2_BRANCH
+
+fi #ODL_ENABLE_L3_FWD check
+
 cat >> ${local_conf_file_name} << EOF
 [[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
 [agent]