starlingx
/
config
Code Issues Proposed changes

Add an additional check for data interface configuration 

If an interface is data interface and the vswitch type is not
accelerated, the data interface is a member of a linux bridge
and then the linux bridge will occupy the interface after host
unlock. if so, it will cause conflict with ovs bridge when ovs
agent add the interface to ovs bridge.
this patch add an additional check to determine if the vswitch
type supports accelerated interfaces. If it doesn`t support
accelerated interfaces, a bridge should not be created.

Change-Id: I0fbae866c364fe7b787aa850db79bca1bf597389
Closes-bug: #1834556
Signed-off-by: marvin <weifei.yu@intel.com>
(cherry picked from commit 8a4fd5dc79)
This commit is contained in:
marvin 2019-08-12 02:26:15 +00:00 committed by marvin Yu
parent f61bcbf5f1
commit 5b65f38599
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysinv/sysinv/sysinv/sysinv/puppet/interface.py
View File

@ -697,7 +697,8 @@ def get_bridge_interface_name(context, iface):
bridge = None
if (iface['iftype'] == constants.INTERFACE_TYPE_ETHERNET and
is_data_interface(context, iface) and
not is_dpdk_compatible(context, iface)):
not is_dpdk_compatible(context, iface) and
not is_vswitch_type_unaccelerated(context)):
bridge = 'br-' + get_interface_os_ifname(context, iface)
iface['_bridge'] = bridge # cache the result
return iface['_bridge']