From: Feng Pan <fpan@redhat.com>
Date: Fri, 13 Apr 2018 21:47:09 +0000 (-0400)
Subject: Change flat network name for nosdn fdio scenario
X-Git-Tag: opnfv-6.0.0~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F56035%2F1;p=apex-tripleo-heat-templates.git

Change flat network name for nosdn fdio scenario

Since we use networking-vpp's router functionality, we need to create
a tap interface on VPP to connect to br-ex on the host for external
connectivity.

Change-Id: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit f19a086d771a1719bbd5d94a18f2ba1e5e243d61)
---

diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml
index e497013c..ade976d9 100644
--- a/environments/neutron-ml2-vpp.yaml
+++ b/environments/neutron-ml2-vpp.yaml
@@ -17,7 +17,10 @@ parameter_defaults:
   NeutronNetworkType: vlan
   NeutronServicePlugins: vpp-router
   NeutronTypeDrivers: vlan,flat
+  NeutronFlatNetworks: external
   ExtraConfig:
-    # Use Linux Bridge driver for DHCP and L3 agent.
+    # Use Linux Bridge driver for DHCP agent.
     neutron::agents::dhcp::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"
-    neutron::agents::l3::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver"
+    # Create VPP tap0 interface and connect it to br-ex linux bridge for external connectivity.
+    fdio::vpp_exec_commands: ["create tap host-if-name vpp_ext_tap host-bridge br-ex rx-ring-size 1024 tx-ring-size 1024", "set interface state tap0 up"]
+