Merge "OVN: Add VLAN to NeutronNetworkType"

This commit is contained in:
Zuul 2019-03-13 00:24:33 +00:00 committed by Gerrit Code Review
commit 71a144dc1e
3 changed files with 3 additions and 3 deletions

@ -22,7 +22,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1

@ -20,7 +20,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"

@ -22,7 +22,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1