Remove use of ODL_ENABLE_L3_FWD

Change-Id: Ic7c0a0b04d2bf47cfe7c905faf7b455dfde38489
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 2f3bc4087eb3615993b88274b07807acf7885db8..5c5265604df57ae4f329f3d5c9350ed346b247d1 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -55,7 +55,6 @@
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1
-    odl-enable-l3: 'yes'
     odl-ml2-driver-version: 'v1'
     odl-ml2-port-binding: 'network-topology'
     public-bridge: 'br-physnet1'

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index bdec49d53137ef566cd165f89250a4488a9ba3a8..a77c5ac30b23426c189c351987cfd4772b7e07c2 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -189,7 +189,6 @@ ODL_ML2_PORT_BINDING: ${ODL_ML2_PORT_BINDING}
 DEVSTACK_KUBERNETES_PLUGIN_REPO: ${DEVSTACK_KUBERNETES_PLUGIN_REPO}
 DEVSTACK_LBAAS_PLUGIN_REPO: ${DEVSTACK_LBAAS_PLUGIN_REPO}
 DEVSTACK_NETWORKING_SFC_PLUGIN_REPO: ${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO}
-ODL_ENABLE_L3_FWD: ${ODL_ENABLE_L3_FWD}
 IPSEC_VXLAN_TUNNELS_ENABLED: ${IPSEC_VXLAN_TUNNELS_ENABLED}
 PUBLIC_BRIDGE: ${PUBLIC_BRIDGE}
 ENABLE_HAPROXY_FOR_NEUTRON: ${ENABLE_HAPROXY_FOR_NEUTRON}

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index c6e567b8970e337c17d756c36067395c34cdedae..619f3c311853fefca6fd877d764e1eacb9f1ec39 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -76,12 +76,6 @@ if [[ ! -z "${REPO_URL}" ]]; then
 fi
 cat ${FEATURESCONF}
 
-if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
-  echo "Enable the l3.fwd in custom.properties.."
-  echo "ovsdb.l3.fwd.enabled=yes" >> ${CUSTOMPROP}
-  cat ${CUSTOMPROP}
-fi
-
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
 set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 6f43a35e5a1d57aa5650441c3457921030f7a5d9..d97877bbcc824dd7f46f8a5ad8f6c95b79dea80c 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -65,12 +65,6 @@ if [[ ! -z "${REPO_URL}" ]]; then
 fi
 cat ${FEATURESCONF}
 
-if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
-    echo "Enable the l3.fwd in custom.properties..."
-    echo "ovsdb.l3.fwd.enabled=yes" >> ${CUSTOMPROP}
-fi
-cat ${CUSTOMPROP}
-
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
 set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 2e56553f2b6023562375232cb2c3fd144ab34330..4c6f737b51af22df25250090828da7e892ee2201 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -250,6 +250,10 @@ NEUTRON_LBAAS_SERVICE_PROVIDERV2=${LBAAS_SERVICE_PROVIDER} # Only relevant if ne
 NEUTRON_SFC_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
 NEUTRON_FLOWCLASSIFIER_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
 ETCD_PORT=2379
+PUBLIC_BRIDGE=${PUBLIC_BRIDGE}
+PUBLIC_PHYSICAL_NETWORK=${PUBLIC_PHYSICAL_NETWORK}
+ML2_VLAN_RANGES=${PUBLIC_PHYSICAL_NETWORK}
+ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS}
 EOF
     if [ "${TENANT_NETWORK_TYPE}" == "local" ]; then
         cat >> ${local_conf_file_name} << EOF
@@ -291,30 +295,20 @@ NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver
 EOF
     fi
 
-    if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
-        cat >> ${local_conf_file_name} << EOF
-
-PUBLIC_BRIDGE=${PUBLIC_BRIDGE}
-PUBLIC_PHYSICAL_NETWORK=${PUBLIC_PHYSICAL_NETWORK}
-ML2_VLAN_RANGES=${PUBLIC_PHYSICAL_NETWORK}
-ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS}
-EOF
-
-        if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
-           SERVICE_PLUGINS="odl-router_v2"
-        else
-           SERVICE_PLUGINS="odl-router"
-        fi
-        if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
-            SERVICE_PLUGINS+=", networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin"
-        fi
-        if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
-            SERVICE_PLUGINS+=", lbaasv2"
-        fi
-        if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
-            SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
-        fi
-    fi #check for ODL_ENABLE_L3_FWD
+    if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
+       SERVICE_PLUGINS="odl-router_v2"
+    else
+       SERVICE_PLUGINS="odl-router"
+    fi
+    if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+        SERVICE_PLUGINS+=", networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin"
+    fi
+    if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
+        SERVICE_PLUGINS+=", lbaasv2"
+    fi
+    if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
+        SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
+    fi
 
     cat >> ${local_conf_file_name} << EOF
 
@@ -412,23 +406,18 @@ DATABASE_PASSWORD=${ADMIN_PASSWORD}
 RABBIT_PASSWORD=${ADMIN_PASSWORD}
 SERVICE_TOKEN=${ADMIN_PASSWORD}
 SERVICE_PASSWORD=${ADMIN_PASSWORD}
-EOF
-
-    if [[ "${ENABLE_OS_PLUGINS}" =~ networking-odl ]]; then
-        cat >> ${local_conf_file_name} << EOF
-
-enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
-EOF
-    fi
-
-    if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
-        cat >> ${local_conf_file_name} << EOF
 
 PUBLIC_BRIDGE=${PUBLIC_BRIDGE}
 PUBLIC_PHYSICAL_NETWORK=${PUBLIC_PHYSICAL_NETWORK}
 ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS}
 Q_L3_ENABLED=True
 ODL_L3=${ODL_L3}
+EOF
+
+    if [[ "${ENABLE_OS_PLUGINS}" =~ networking-odl ]]; then
+        cat >> ${local_conf_file_name} << EOF
+
+enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
 EOF
     fi
 
@@ -1108,7 +1097,6 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
     -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
     -v ODL_SNAT_MODE:${ODL_SNAT_MODE} \
-    -v ODL_ENABLE_L3_FWD:${ODL_ENABLE_L3_FWD} \
     -v ODL_STREAM:${DISTROSTREAM} \
     -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
     -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} \

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 10d55c7df31905eeaab7963e69a4ca7e8f763ef7..7ad19c5e7afeb6a599b515bae9ac6b5fb7d1657f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -915,10 +915,6 @@
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
           default: '{devstack-networking-sfc-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
-      - string:
-          name: ODL_ENABLE_L3_FWD
-          default: '{odl-enable-l3}'
-          description: 'Enable L3 FWD in ODL for createing br-ex'
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
           default: '{ipsec-vxlan-tunnels-enabled}'
@@ -1133,10 +1129,6 @@
           name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
           default: '{devstack-networking-sfc-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
-      - string:
-          name: ODL_ENABLE_L3_FWD
-          default: '{odl-enable-l3}'
-          description: 'Enable L3 FWD in ODL for createing br-ex'
       - string:
           name: IPSEC_VXLAN_TUNNELS_ENABLED
           default: '{ipsec-vxlan-tunnels-enabled}'