diff options
| -rw-r--r-- | environments/neutron-l2gw-opendaylight.yaml | 2 | ||||
| -rw-r--r-- | environments/neutron-ml2-vpp.yaml | 10 | ||||
| -rw-r--r-- | puppet/role.role.j2.yaml | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/environments/neutron-l2gw-opendaylight.yaml b/environments/neutron-l2gw-opendaylight.yaml index 2168dbc3..3ee9de77 100644 --- a/environments/neutron-l2gw-opendaylight.yaml +++ b/environments/neutron-l2gw-opendaylight.yaml @@ -8,7 +8,7 @@ resource_registry: OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml parameter_defaults: - NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" + NeutronServicePlugins: "odl-router_v2,trunk,networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default'] # Optional diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml index 1dec395c..ade976d9 100644 --- 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"] + diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index a3cbe851..6e34cf76 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -582,6 +582,7 @@ resources: - cisco_n1kv_data # Optionally provided by Controller/ComputeExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - cisco_aci_data # Optionally provided by Controller/ComputeExtraConfigPre + - common # Optionally provided by os-net-config merge_behavior: deeper datafiles: service_names: |