Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / environments / neutron-ml2-vpp.yaml

diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml
index 1dec395..ade976d 100644 (file)
--- a/environments/neutron-ml2-vpp.yaml
+++ b/environments/neutron-ml2-vpp.yaml
@@ -6,6 +6,7 @@ resource_registry:
   OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml
   OS::TripleO::Services::Etcd: ../puppet/services/etcd.yaml
   OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 
 parameter_defaults:
   #Comma delimited list of <physical_network>:<VPP Interface>.
@@ -14,9 +15,12 @@ parameter_defaults:
 
   NeutronMechanismDrivers: vpp
   NeutronNetworkType: vlan
-  NeutronServicePlugins: router
+  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"]
+