Merge pull request #1277 from mslacken/EnhanceNetNaming

better udev net rules

CHANGELOG.md

@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add support for VLANs to NetworkManager, wicked, ifcfg, debian.network_interfaces overlays. #1257
 - Add support for static routes to NetworkManager, wicked, ifcfg, debian.network_interfaces overlays. #1257
 - Add `wwctl upgrade <config|nodes>`. #230, #517
+- Better handling of InfiniBand udev net naming. #1227
 
 ### Changed
 
@@ -59,6 +60,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Update default `warewulfd` port to match shipped configuration. #1448
 - Replace `olekukonko/tablewriter` with `cheynewallace/tabby`. #1497, #1498
 - replaced deprecated errors.Wrapf with fmr.Errorf. #1534
+- Rename udev net naming file to 70-persistent-net.rules. #1227
 
 ### Removed
 

overlays/udev.netname/internal/udev_netname_test.go

@@ -14,7 +14,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
 	env := testenv.New(t)
 	defer env.RemoveAll(t)
 	env.ImportFile(t, "etc/warewulf/nodes.conf", "nodes.conf")
-	env.ImportFile(t, "var/lib/warewulf/overlays/udev.netname/rootfs/etc/udev/rules.d/70-ww4-netname.rules.ww", "../rootfs/etc/udev/rules.d/70-ww4-netname.rules.ww")
+	env.ImportFile(t, "var/lib/warewulf/overlays/udev.netname/rootfs/etc/udev/rules.d/70-persistent-net.rules.ww", "../rootfs/etc/udev/rules.d/70-persistent-net.rules.ww")
 
 	tests := []struct {
 		name string
@@ -23,7 +23,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
 	}{
 		{
 			name: "udev.netname",
-			args: []string{"--render", "node1", "udev.netname", "etc/udev/rules.d/70-ww4-netname.rules.ww"},
+			args: []string{"--render", "node1", "udev.netname", "etc/udev/rules.d/70-persistent-net.rules.ww"},
 			log:  udev_netname,
 		},
 	}
@@ -49,7 +49,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
 
 const udev_netname string = `backupFile: true
 writeFile: true
-Filename: etc/udev/rules.d/70-ww4-netname.rules
+Filename: etc/udev/rules.d/70-persistent-net.rules
 # This file is autogenerated by warewulf
 
 SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="e6:92:39:49:7b:03", NAME="wwnet0"

overlays/udev.netname/rootfs/etc/udev/rules.d/70-persistent-net.rules.ww

@@ -1,6 +1,10 @@
 # This file is autogenerated by warewulf
 {{range $devname, $netdev := .NetDevs}}
 {{- if $netdev.Hwaddr }}
+{{- if eq $netdev.Type "infiniband" }}
+SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="?*{{ $netdev.Hwaddr }}", NAME="{{ $netdev.Device }}"
+{{- else }}
 SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="{{ $netdev.Hwaddr }}", NAME="{{ $netdev.Device }}"
 {{ end -}}
 {{ end -}}
+{{ end -}}

userdocs/contents/ipmi.rst

@@ -110,7 +110,7 @@ Node View
   n001                 init               --           (/sbin/init)
   n001                 asset              --           --
   n001                 kerneloverride     --           tw
-  n001                 kernelargs         --           (quiet crashkernel=no vga=791 net.naming-scheme=v238)
+  n001                 kernelargs         --           (quiet crashkernel=no net.ifnames=1)
   n001                 ipmiaddr           --           --
   n001                 ipminetmask        --           --
   n001                 ipmiport           --           --

userdocs/contents/nodeconfig.rst

@@ -94,7 +94,7 @@ You can also see the node's full attribute list by specifying the
   n001                 init               --           (/sbin/init)
   n001                 asset              --           --
   n001                 kerneloverride     --           --
-  n001                 kernelargs         --           (quiet crashkernel=no vga=791 net.naming-scheme=v238)
+  n001                 kernelargs         --           (quiet crashkernel=no net.ifnames=1)
   n001                 ipmiaddr           --           --
   n001                 ipminetmask        --           --
   n001                 ipmiport           --           --
@@ -200,7 +200,7 @@ container, kernel, and network:
   n001                 init               --           (/sbin/init)
   n001                 asset              --           --
   n001                 kerneloverride     --           tw
-  n001                 kernelargs         --           (quiet crashkernel=no vga=791 net.naming-scheme=v238)
+  n001                 kernelargs         --           (quiet crashkernel=no net.ifnames=1)
   n001                 ipmiaddr           --           --
   n001                 ipminetmask        --           --
   n001                 ipmiport           --           --

userdocs/contents/setup.rst

@@ -122,7 +122,7 @@ You can check the result with ``wwctl node list``.
   deliverynet  SystemOverlay                     --       (wwinit,wwclient,fstab,hostname,ssh.host_keys,issue,resolv,udev.netname,systemd.netname,ifcfg,NetworkManager,debian.interfaces,wicked,ignition)
   deliverynet  Root                              --       (initramfs)
   deliverynet  Init                              --       (/sbin/init)
-  deliverynet  Kernel.Args                       --       (quiet crashkernel=no vga=791 net.naming-scheme=v238)
+  deliverynet  Kernel.Args                       --       (quiet crashkernel=no net.ifnames=1)
   deliverynet  Profiles                          --       default
   deliverynet  PrimaryNetDev                     --       (deliver1)
   deliverynet  NetDevs[deliver2].Type            --       (ethernet)