From 805704ce08289d707dedcd02dd2512ac28e701ad Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 17 Oct 2024 16:43:31 -0400 Subject: [PATCH] Minimize nodes.conf for overlay tests Also updated issue to show both configured and detected address. Signed-off-by: Jonathon Anderson --- overlays/NetworkManager/internal/nodes.conf | 63 -------------- .../debian.interfaces/internal/nodes.conf | 67 --------------- overlays/debug/internal/nodes.conf | 1 - overlays/fstab/internal/nodes.conf | 63 -------------- overlays/host/internal/nodes.conf | 65 --------------- overlays/hostname/internal/nodes.conf | 82 +------------------ overlays/hosts/internal/nodes.conf | 68 --------------- overlays/ifcfg/internal/nodes.conf | 64 --------------- overlays/ignition/internal/nodes.conf | 63 -------------- overlays/issue/internal/issue_test.go | 4 +- overlays/issue/internal/nodes.conf | 65 +-------------- overlays/issue/rootfs/etc/issue.ww | 4 +- overlays/resolv/internal/nodes.conf | 75 ----------------- .../ssh.authorized_keys/internal/nodes.conf | 82 +------------------ overlays/ssh.host_keys/internal/nodes.conf | 82 +------------------ overlays/syncuser/internal/nodes.conf | 82 +------------------ overlays/systemd.netname/internal/nodes.conf | 73 ----------------- overlays/udev.netname/internal/nodes.conf | 73 ----------------- overlays/wicked/internal/nodes.conf | 67 --------------- overlays/wwclient/internal/nodes.conf | 82 +------------------ overlays/wwinit/internal/nodes.conf | 73 +---------------- 21 files changed, 13 insertions(+), 1285 deletions(-) diff --git a/overlays/NetworkManager/internal/nodes.conf b/overlays/NetworkManager/internal/nodes.conf index e9b04d07..5039a62b 100644 --- a/overlays/NetworkManager/internal/nodes.conf +++ b/overlays/NetworkManager/internal/nodes.conf @@ -1,35 +1,6 @@ WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 @@ -46,37 +17,3 @@ nodes: tags: DNS1: 8.8.8.8 DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/debian.interfaces/internal/nodes.conf b/overlays/debian.interfaces/internal/nodes.conf index e9b04d07..406ce4b2 100644 --- a/overlays/debian.interfaces/internal/nodes.conf +++ b/overlays/debian.interfaces/internal/nodes.conf @@ -1,35 +1,5 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 @@ -43,40 +13,3 @@ nodes: ipaddr: 192.168.3.22 netmask: 255.255.255.0 gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/debug/internal/nodes.conf b/overlays/debug/internal/nodes.conf index e9b04d07..34a7646a 100644 --- a/overlays/debug/internal/nodes.conf +++ b/overlays/debug/internal/nodes.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 45 nodeprofiles: default: runtime overlay: diff --git a/overlays/fstab/internal/nodes.conf b/overlays/fstab/internal/nodes.conf index e9b04d07..c3b365ac 100644 --- a/overlays/fstab/internal/nodes.conf +++ b/overlays/fstab/internal/nodes.conf @@ -1,58 +1,5 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true disks: /dev/vda: wipe_table: true @@ -70,13 +17,3 @@ nodes: /dev/disk/by-partlabel/swap: format: swap path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/host/internal/nodes.conf b/overlays/host/internal/nodes.conf index e9b04d07..3b286313 100644 --- a/overlays/host/internal/nodes.conf +++ b/overlays/host/internal/nodes.conf @@ -1,82 +1,17 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 hwaddr: e6:92:39:49:7b:03 ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 secondary: device: wwnet1 hwaddr: 9a:77:29:73:14:f1 ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap node2: - profiles: - - default network devices: default: device: wwnet0 hwaddr: e6:92:39:49:7b:04 ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/hostname/internal/nodes.conf b/overlays/hostname/internal/nodes.conf index e9b04d07..132a2f4a 100644 --- a/overlays/hostname/internal/nodes.conf +++ b/overlays/hostname/internal/nodes.conf @@ -1,82 +1,2 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: - node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 + node1: {} diff --git a/overlays/hosts/internal/nodes.conf b/overlays/hosts/internal/nodes.conf index e9b04d07..a37231b9 100644 --- a/overlays/hosts/internal/nodes.conf +++ b/overlays/hosts/internal/nodes.conf @@ -1,82 +1,14 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 - hwaddr: e6:92:39:49:7b:03 ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 secondary: device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap node2: - profiles: - - default network devices: default: device: wwnet0 - hwaddr: e6:92:39:49:7b:04 ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/ifcfg/internal/nodes.conf b/overlays/ifcfg/internal/nodes.conf index e9b04d07..59a1dfa8 100644 --- a/overlays/ifcfg/internal/nodes.conf +++ b/overlays/ifcfg/internal/nodes.conf @@ -1,35 +1,5 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 @@ -46,37 +16,3 @@ nodes: tags: DNS1: 8.8.8.8 DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/ignition/internal/nodes.conf b/overlays/ignition/internal/nodes.conf index e9b04d07..c3b365ac 100644 --- a/overlays/ignition/internal/nodes.conf +++ b/overlays/ignition/internal/nodes.conf @@ -1,58 +1,5 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true disks: /dev/vda: wipe_table: true @@ -70,13 +17,3 @@ nodes: /dev/disk/by-partlabel/swap: format: swap path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/issue/internal/issue_test.go b/overlays/issue/internal/issue_test.go index 7a467e29..921fa7bb 100644 --- a/overlays/issue/internal/issue_test.go +++ b/overlays/issue/internal/issue_test.go @@ -56,9 +56,9 @@ Kernelargs: quiet crashkernel=no vga=791 net.naming-scheme=v238 Network: default: wwnet0 - default: \4{wwnet0} + default: \4{wwnet0} (configured: 192.168.3.21) default: e6:92:39:49:7b:03 secondary: wwnet1 - secondary: \4{wwnet1} + secondary: \4{wwnet1} (configured: 192.168.3.22) secondary: 9a:77:29:73:14:f1 ` diff --git a/overlays/issue/internal/nodes.conf b/overlays/issue/internal/nodes.conf index e9b04d07..fac3a0be 100644 --- a/overlays/issue/internal/nodes.conf +++ b/overlays/issue/internal/nodes.conf @@ -1,35 +1,8 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default container name: rockylinux-9 + kernel: + args: quiet crashkernel=no vga=791 net.naming-scheme=v238 network devices: default: device: wwnet0 @@ -46,37 +19,3 @@ nodes: tags: DNS1: 8.8.8.8 DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/issue/rootfs/etc/issue.ww b/overlays/issue/rootfs/etc/issue.ww index f7cd4e86..c6f4fe7e 100644 --- a/overlays/issue/rootfs/etc/issue.ww +++ b/overlays/issue/rootfs/etc/issue.ww @@ -6,9 +6,9 @@ Kernelargs: {{.Kernel.Args}} Network: {{- range $devname, $netdev := .NetDevs}} {{$devname}}: {{$netdev.Device}} - {{$devname}}: \4{{ print "{" }}{{$netdev.Device}}{{ print "}" }} + {{$devname}}: \4{{ print "{" }}{{$netdev.Device}}{{ print "}" }} (configured: {{$netdev.Ipaddr}}) {{- if $netdev.Ipaddr6 }} - {{$devname}}: \6{{ print "{" }}{{$netdev.Device}}{{ print "}" }} + {{$devname}}: \6{{ print "{" }}{{$netdev.Device}}{{ print "}" }} (configured: {{$netdev.Ipaddr6}}) {{- end }} {{- if $netdev.Hwaddr }} {{$devname}}: {{$netdev.Hwaddr}} diff --git a/overlays/resolv/internal/nodes.conf b/overlays/resolv/internal/nodes.conf index e9b04d07..0ce2a9d7 100644 --- a/overlays/resolv/internal/nodes.conf +++ b/overlays/resolv/internal/nodes.conf @@ -1,82 +1,7 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 tags: DNS1: 8.8.8.8 DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/ssh.authorized_keys/internal/nodes.conf b/overlays/ssh.authorized_keys/internal/nodes.conf index e9b04d07..132a2f4a 100644 --- a/overlays/ssh.authorized_keys/internal/nodes.conf +++ b/overlays/ssh.authorized_keys/internal/nodes.conf @@ -1,82 +1,2 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: - node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 + node1: {} diff --git a/overlays/ssh.host_keys/internal/nodes.conf b/overlays/ssh.host_keys/internal/nodes.conf index e9b04d07..132a2f4a 100644 --- a/overlays/ssh.host_keys/internal/nodes.conf +++ b/overlays/ssh.host_keys/internal/nodes.conf @@ -1,82 +1,2 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: - node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 + node1: {} diff --git a/overlays/syncuser/internal/nodes.conf b/overlays/syncuser/internal/nodes.conf index e9b04d07..132a2f4a 100644 --- a/overlays/syncuser/internal/nodes.conf +++ b/overlays/syncuser/internal/nodes.conf @@ -1,82 +1,2 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: - node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 + node1: {} diff --git a/overlays/systemd.netname/internal/nodes.conf b/overlays/systemd.netname/internal/nodes.conf index e9b04d07..2126f306 100644 --- a/overlays/systemd.netname/internal/nodes.conf +++ b/overlays/systemd.netname/internal/nodes.conf @@ -1,82 +1,9 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 secondary: device: wwnet1 hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/udev.netname/internal/nodes.conf b/overlays/udev.netname/internal/nodes.conf index e9b04d07..2126f306 100644 --- a/overlays/udev.netname/internal/nodes.conf +++ b/overlays/udev.netname/internal/nodes.conf @@ -1,82 +1,9 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 secondary: device: wwnet1 hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/wicked/internal/nodes.conf b/overlays/wicked/internal/nodes.conf index e9b04d07..406ce4b2 100644 --- a/overlays/wicked/internal/nodes.conf +++ b/overlays/wicked/internal/nodes.conf @@ -1,35 +1,5 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: node1: - profiles: - - default - container name: rockylinux-9 network devices: default: device: wwnet0 @@ -43,40 +13,3 @@ nodes: ipaddr: 192.168.3.22 netmask: 255.255.255.0 gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 diff --git a/overlays/wwclient/internal/nodes.conf b/overlays/wwclient/internal/nodes.conf index e9b04d07..132a2f4a 100644 --- a/overlays/wwclient/internal/nodes.conf +++ b/overlays/wwclient/internal/nodes.conf @@ -1,82 +1,2 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 - init: /sbin/init - root: initramfs - ipxe template: default nodes: - node1: - profiles: - - default - container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 - ipmi: - username: user - password: password - ipaddr: 192.168.4.21 - netmask: 255.255.255.0 - gateway: 192.168.4.1 - write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1 + node1: {} diff --git a/overlays/wwinit/internal/nodes.conf b/overlays/wwinit/internal/nodes.conf index e9b04d07..0174efe0 100644 --- a/overlays/wwinit/internal/nodes.conf +++ b/overlays/wwinit/internal/nodes.conf @@ -1,51 +1,9 @@ -WW_INTERNAL: 45 -nodeprofiles: - default: - runtime overlay: - - hosts - - ssh.authorized_keys - - syncuser - system overlay: - - wwinit - - wwclient - - fstab - - hostname - - ssh.host_keys - - issue - - resolv - - udev.netname - - systemd.netname - - ifcfg - - NetworkManager - - debian.interfaces - - wicked - - ignition - kernel: - args: quiet crashkernel=no vga=791 net.naming-scheme=v238 +nodes: + node1: init: /sbin/init root: initramfs ipxe template: default -nodes: - node1: - profiles: - - default container name: rockylinux-9 - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:03 - ipaddr: 192.168.3.21 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - secondary: - device: wwnet1 - hwaddr: 9a:77:29:73:14:f1 - ipaddr: 192.168.3.22 - netmask: 255.255.255.0 - gateway: 192.168.3.1 - tags: - DNS1: 8.8.8.8 - DNS2: 8.8.4.4 ipmi: username: user password: password @@ -53,30 +11,3 @@ nodes: netmask: 255.255.255.0 gateway: 192.168.4.1 write: true - disks: - /dev/vda: - wipe_table: true - partitions: - scratch: - should_exist: true - swap: - number: "1" - size_mib: "1024" - filesystems: - /dev/disk/by-partlabel/scratch: - format: btrfs - path: /scratch - wipe_filesystem: true - /dev/disk/by-partlabel/swap: - format: swap - path: swap - node2: - profiles: - - default - network devices: - default: - device: wwnet0 - hwaddr: e6:92:39:49:7b:04 - ipaddr: 192.168.3.23 - netmask: 255.255.255.0 - gateway: 192.168.3.1