Fixes missing 'flat' network type for ODL OVS

The allowed network types were missing 'flat', which will allow nodes to
attach nova instances to flat networks.  This should be allowed by
default.

Partial-Bug: 1762495

Change-Id: Iccee353763823fddd18dc6bbbd857a71f1c2320a
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 8cf40527c4)
This commit is contained in:
Tim Rozet 2018-04-09 14:29:54 -04:00
parent a900c54c16
commit 78a3933512
3 changed files with 9 additions and 4 deletions

View File

@ -47,8 +47,8 @@
# The value 'local' is only useful for single-box testing
# but provides no connectivity between hosts.
# Should be an array that can have these elements:
# local, vlan, gre, vxlan
# Defaults to ['local', 'vlan', 'gre', 'vxlan']
# local, flat, vlan, gre, vxlan
# Defaults to ['local', 'flat', 'vlan', 'gre', 'vxlan']
#
# [*enable_dpdk*]
# (optional) Enables vhostuser VIF host configuration for OVS DPDK.
@ -98,7 +98,7 @@ class neutron::plugins::ovs::opendaylight (
$retry_interval = 60,
$retry_count = 20,
$host_id = $fqdn,
$allowed_network_types = ['local', 'vlan', 'vxlan', 'gre'],
$allowed_network_types = ['local', 'flat', 'vlan', 'vxlan', 'gre'],
$enable_dpdk = false,
$vhostuser_socket_dir = '/var/run/openvswitch',
$vhostuser_mode = 'server',

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes missing "flat" network type in the allowed network types for
OpenDaylight OVS.

View File

@ -11,7 +11,7 @@ describe 'neutron::plugins::ovs::opendaylight' do
:retry_interval => 60,
:retry_count => 20,
:host_id => "dummy_host",
:allowed_network_types => ['local', 'vlan', 'vxlan', 'gre'],
:allowed_network_types => ['local', 'flat', 'vlan', 'vxlan', 'gre'],
:enable_dpdk => false,
:vhostuser_socket_dir => '/var/run/openvswitch',
:vhostuser_mode => 'server',