openstack
/
os-net-config
Code Issues Proposed changes

Merge "Mellanox NICs' ifcfg-scripts should not be removed when no CONFIG change exists" into stable/train

This commit is contained in:
Zuul 2022-11-12 12:54:58 +00:00 committed by Gerrit Code Review
parent a5190badd4 a598d011dc
commit 261fa378c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os_net_config/impl_ifcfg.py
View File

@ -51,6 +51,7 @@ def remove_ifcfg_config(ifname):
if re.match('[\w-]+$', ifname): if re.match('[\w-]+$', ifname):
ifcfg_file = ifcfg_config_path(ifname) ifcfg_file = ifcfg_config_path(ifname)
if os.path.exists(ifcfg_file): if os.path.exists(ifcfg_file):
logger.info('removing existing ifcfg script for intf: %s' % ifname)
os.remove(ifcfg_file) os.remove(ifcfg_file)
@ -951,7 +952,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
# Bind the dpdk interface # Bind the dpdk interface
utils.bind_dpdk_interfaces(ifname, ovs_dpdk_port.driver, self.noop) utils.bind_dpdk_interfaces(ifname, ovs_dpdk_port.driver, self.noop)
if not self.noop: if not self.noop and (not utils.is_mellanox_interface(ifname)):
remove_ifcfg_config(ifname) remove_ifcfg_config(ifname)
data = self._add_common(ovs_dpdk_port) data = self._add_common(ovs_dpdk_port)
@ -981,7 +982,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
# checks are added at the object creation stage. # checks are added at the object creation stage.
ifname = dpdk_port.members[0].name ifname = dpdk_port.members[0].name
utils.bind_dpdk_interfaces(ifname, dpdk_port.driver, self.noop) utils.bind_dpdk_interfaces(ifname, dpdk_port.driver, self.noop)
if not self.noop: if not self.noop and (not utils.is_mellanox_interface(ifname)):
remove_ifcfg_config(ifname) remove_ifcfg_config(ifname)
data = self._add_common(ovs_dpdk_bond) data = self._add_common(ovs_dpdk_bond)