From f40b61ed6712f80a76a39cddfb11d02d20d06e2d Mon Sep 17 00:00:00 2001 From: Sanjay Upadhyay Date: Mon, 9 Jan 2017 15:17:13 +0530 Subject: Remove child members activation for OVS-DPDK bond While creating DPDK bond, if-up of the bond interface itself will activate the member interfaces. Individual members should not be called for ifup. Additionally, removing the option to select the primary active-slave member for the bond, because of #1654975. Once it is fixed, primary selection from the network config will be added. Change-Id: I83527ada4a3618927d55b7aa06d436686b12d5b8 Closes-Bug: #1643026. --- os_net_config/impl_ifcfg.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index 6c44c88..6d3c681 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -286,15 +286,18 @@ class IfcfgNetConfig(os_net_config.NetConfig): data += "OVS_BRIDGE=%s\n" % base_opt.bridge_name elif isinstance(base_opt, objects.OvsDpdkBond): ovs_extra.extend(base_opt.ovs_extra) - if base_opt.primary_interface_name: - primary_name = base_opt.primary_interface_name - self.bond_primary_ifaces[base_opt.name] = primary_name + # Referring to bug:1643026, the below commenting of the interfaces, + # is to workaround the error, but is not the long term solution. + # The long term solution is to run DPDK options before + # os-net-config, which is being tracked at BUG:1654975 + # if base_opt.primary_interface_name: + # primary_name = base_opt.primary_interface_name + # self.bond_primary_ifaces[base_opt.name] = primary_name data += "DEVICETYPE=ovs\n" data += "TYPE=OVSDPDKBond\n" data += "OVS_BRIDGE=%s\n" % base_opt.bridge_name if base_opt.members: members = [member.name for member in base_opt.members] - self.member_names[base_opt.name] = members data += ("BOND_IFACES=\"%s\"\n" % " ".join(members)) if base_opt.ovs_options: data += "OVS_OPTIONS=\"%s\"\n" % base_opt.ovs_options -- cgit 1.2.3-korg