openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Adding a udev rule to save sriov interface name before configuring switchdev"

Browse Source
This commit is contained in:
Zuul 2019-03-05 17:18:42 +00:00 committed by Gerrit Code Review
commit 5bbc491ba2
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/puppet/provider/sriov_vf_config/numvfs.rb
View File

@ -62,14 +62,32 @@ Puppet::Type.type(:sriov_vf_config).provide(:numvfs) do
File.write("/sys/bus/pci/drivers/mlx5_core/unbind",vfs_pci) File.write("/sys/bus/pci/drivers/mlx5_core/unbind",vfs_pci)
end end
end end
# Saving the name of sriov interface to udev rules
udev_file_path = "/etc/udev/rules.d/70-persistent-net.rules"
sriov_interface_mac = File.read(sriov_interface_mac_path).strip
udev_data_line = get_udev_data_line(sriov_interface_mac)
File.write(udev_file_path, udev_data_line, mode: 'a')
%x{/usr/sbin/udevadm control --reload-rules}
%x{/usr/sbin/udevadm trigger}
# Changing the mode of sriov interface to switchdev mode # Changing the mode of sriov interface to switchdev mode
%x{/usr/sbin/devlink dev eswitch set pci/#{get_interface_pci} mode switchdev} %x{/usr/sbin/devlink dev eswitch set pci/#{get_interface_pci} mode switchdev}
%x{/usr/sbin/ifup #{sriov_get_interface}}
if get_interface_device == "0x1013" || get_interface_device == "0x1015" if get_interface_device == "0x1013" || get_interface_device == "0x1015"
%x{/usr/sbin/devlink dev eswitch set pci/#{get_interface_pci} inline-mode transport} %x{/usr/sbin/devlink dev eswitch set pci/#{get_interface_pci} inline-mode transport}
end end
%x{/usr/sbin/ethtool -K #{sriov_get_interface} hw-tc-offload on} %x{/usr/sbin/ethtool -K #{sriov_get_interface} hw-tc-offload on}
end end
def get_udev_data_line(mac)
'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="' + "#{mac}" + '", NAME="' + "#{sriov_get_interface}" + "\"\n"
end
def sriov_interface_mac_path
"/sys/class/net/#{sriov_get_interface}/address"
end
def sriov_numvfs_path def sriov_numvfs_path
"/sys/class/net/#{sriov_get_interface}/device/sriov_numvfs" "/sys/class/net/#{sriov_get_interface}/device/sriov_numvfs"
end end

1
spec/defines/tripleo_host_sriov_numvfs_persistence_spec.rb
View File

@ -91,6 +91,7 @@ then
fi fi
interface_pci=$(grep PCI_SLOT_NAME /sys/class/net/eth0/device/uevent | cut -d'=' -f2) interface_pci=$(grep PCI_SLOT_NAME /sys/class/net/eth0/device/uevent | cut -d'=' -f2)
/usr/sbin/devlink dev eswitch set pci/\"$interface_pci\" mode switchdev /usr/sbin/devlink dev eswitch set pci/\"$interface_pci\" mode switchdev
/usr/sbin/ifup eth0
if [[ \"$(/usr/sbin/devlink dev eswitch show pci/\"$interface_pci\")\" =~ \"mode switchdev\" ]] if [[ \"$(/usr/sbin/devlink dev eswitch show pci/\"$interface_pci\")\" =~ \"mode switchdev\" ]]
then then
echo \"PCI device $interface_pci set to mode switchdev.\" echo \"PCI device $interface_pci set to mode switchdev.\"

1
templates/switchdev/switchdev.epp
View File

@ -22,6 +22,7 @@ then
fi fi
interface_pci=$(grep PCI_SLOT_NAME /sys/class/net/<%=$interface%>/device/uevent | cut -d'=' -f2) interface_pci=$(grep PCI_SLOT_NAME /sys/class/net/<%=$interface%>/device/uevent | cut -d'=' -f2)
/usr/sbin/devlink dev eswitch set pci/"$interface_pci" mode switchdev /usr/sbin/devlink dev eswitch set pci/"$interface_pci" mode switchdev
/usr/sbin/ifup <%=$interface%>
if [[ "$(/usr/sbin/devlink dev eswitch show pci/"$interface_pci")" =~ "mode switchdev" ]] if [[ "$(/usr/sbin/devlink dev eswitch show pci/"$interface_pci")" =~ "mode switchdev" ]]
then then
echo "PCI device $interface_pci set to mode switchdev." echo "PCI device $interface_pci set to mode switchdev."