kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixes for split overlays

Browse Source 
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2024-10-07 12:04:28 +02:00
committed by Jonathon Anderson
parent c08cd82e68
commit 0c6e7cc58a
39 changed files with 792 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
overlays/debug/internal/debug_test.go
View File

@@ -83,10 +83,8 @@ data from other structures.
- Root: initramfs
- AssetKey:
- Discoverable:
- Profiles: empty
- Profiles: default
- Tags:
- TagsDel:
- Keys:
- Kernel:
- Version:
- Override:
@@ -101,39 +99,32 @@ data from other structures.
- Interface:
- Write: true
- Tags:
- TagsDel:
- NetDevs[default]:
- Type: ethernet
- OnBoot: true
- Type:
- Manual: false
- Device: wwnet0
- Hwaddr: e6:92:39:49:7b:03
- Ipaddr: 192.168.3.21
- IpCIDR: 192.168.3.21/24
- Ipaddr6:
- Prefix:
- Ipaddr6: <nil>
- Prefix: <nil>
- Netmask: 255.255.255.0
- Gateway: 192.168.3.1
- MTU:
- Primary: true
- Default:
- Primary: false
- Tags:
- TagsDel:
- NetDevs[secondary]:
- Type: ethernet
- OnBoot: true
- Type:
- Manual: false
- Device: wwnet1
- Hwaddr: 9a:77:29:73:14:f1
- Ipaddr: 192.168.3.22
- IpCIDR: 192.168.3.22/24
- Ipaddr6:
- Prefix:
- Ipaddr6: <nil>
- Prefix: <nil>
- Netmask: 255.255.255.0
- Gateway: 192.168.3.1
- MTU:
- Primary:
- Default:
- Primary: false
- Tags: DNS1=8.8.8.8 DNS2=8.8.4.4
- TagsDel:
## Build variables
@@ -151,7 +142,7 @@ data from other structures.
- Ipaddr6:
- Netmask:
- Network:
- NetworkCIDR: <nil>
- NetworkCIDR:
- Ipv6: false
@@ -198,13 +189,13 @@ data from other structures.
- ClusterName:
- ContainerName: rockylinux-9
- Ipxe: default
- RuntimeOverlay: hosts
- SystemOverlay: wwinit
- RuntimeOverlay: [hosts ssh.authorized_keys syncuser]
- SystemOverlay: [wwinit wwclient fstab hostname ssh.host_keys issue resolv udev.netname systemd.netname ifcfg NetworkManager debian.interfaces wicked ignition]
- Root: initramfs
- Discoverable:
- Init: /sbin/init
- AssetKey:
- Profiles: empty
- Profiles: [default]
- Tags:
- Kernel
- Override:
@@ -220,32 +211,32 @@ data from other structures.
- Write: true
- Tags:
- NetDevs[default]:
- Type: ethernet
- OnBoot: true
- Type:
- Manual: false
- Device: wwnet0
- Hwaddr: e6:92:39:49:7b:03
- Ipaddr: 192.168.3.21
- Ipaddr6:
- IpCIDR:
- Prefix:
- IpCIDR: 192.168.3.21/24
- Ipaddr6: <nil>
- Prefix: <nil>
- Netmask: 255.255.255.0
- Gateway: 192.168.3.1
- MTU:
- Primary: true
- Tags:
- NetDevs[secondary]:
- Type: ethernet
- OnBoot: true
- Type:
- Manual: false
- Device: wwnet1
- Hwaddr: 9a:77:29:73:14:f1
- Ipaddr: 192.168.3.22
- Ipaddr6:
- IpCIDR:
- Prefix:
- IpCIDR: 192.168.3.22/24
- Ipaddr6: <nil>
- Prefix: <nil>
- Netmask: 255.255.255.0
- Gateway: 192.168.3.1
- MTU:
- Primary:
- Primary: false
- Tags: DNS1=8.8.8.8 DNS2=8.8.4.4
- AllNodes[1]:
- Id: node2
@@ -253,36 +244,36 @@ data from other structures.
- ClusterName:
- ContainerName:
- Ipxe: default
- RuntimeOverlay: hosts
- SystemOverlay: wwinit
- RuntimeOverlay: [hosts ssh.authorized_keys syncuser]
- SystemOverlay: [wwinit wwclient fstab hostname ssh.host_keys issue resolv udev.netname systemd.netname ifcfg NetworkManager debian.interfaces wicked ignition]
- Root: initramfs
- Discoverable:
- Init: /sbin/init
- AssetKey:
- Profiles: empty
- Profiles: [default]
- Tags:
- Kernel
- Override:
- Args: quiet crashkernel=no vga=791 net.naming-scheme=v238
- Ipmi:
- Ipaddr:
- Netmask:
- Ipaddr: <nil>
- Netmask: <nil>
- Port:
- Gateway:
- Gateway: <nil>
- UserName:
- Password:
- Interface:
- Write:
- Tags:
- NetDevs[default]:
- Type: ethernet
- OnBoot: true
- Type:
- Manual: false
- Device: wwnet0
- Hwaddr: e6:92:39:49:7b:04
- Ipaddr: 192.168.3.23
- Ipaddr6:
- IpCIDR:
- Prefix:
- IpCIDR: 192.168.3.23/24
- Ipaddr6: <nil>
- Prefix: <nil>
- Netmask: 255.255.255.0
- Gateway: 192.168.3.1
- MTU:

38
overlays/debug/internal/nodes.conf
View File

@@ -1,10 +1,34 @@
WW_INTERNAL: 45
nodeprofiles:
empty: {}
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:
- empty
- default
container name: rockylinux-9
network devices:
default:
@@ -28,13 +52,13 @@ nodes:
ipaddr: 192.168.4.21
netmask: 255.255.255.0
gateway: 192.168.4.1
write: "true"
write: true
disks:
/dev/vda:
wipe_table: "true"
wipe_table: true
partitions:
scratch:
should_exist: "true"
should_exist: true
swap:
number: "1"
size_mib: "1024"
@@ -42,13 +66,13 @@ nodes:
/dev/disk/by-partlabel/scratch:
format: btrfs
path: /scratch
wipe_filesystem: "true"
wipe_filesystem: true
/dev/disk/by-partlabel/swap:
format: swap
path: swap
node2:
profiles:
- empty
- default
network devices:
default:
device: wwnet0

80
overlays/debug/rootfs/warewulf/template-variables.md.ww
View File

@@ -27,8 +27,6 @@ data from other structures.
- Discoverable: {{ .Discoverable }}
- Profiles: {{ range $index, $value := .Profiles }}{{ if $index }},{{ end }}{{ $value }}{{ end }}
- Tags: {{ range $key, $value := .Tags }}{{ $key }}={{ $value }} {{ end }}
- TagsDel: {{ range $key, $value := .TagsDel }}{{ $key }}={{ $value }} {{ end }}
- Keys: {{ range $key, $value := .Keys }}{{ $key }}={{ $value }} {{ end }}
- Kernel:
- Version: {{ .Kernel.Version }}
- Override: {{ .Kernel.Override }}
@@ -43,11 +41,10 @@ data from other structures.
- Interface: {{ .Ipmi.Interface }}
- Write: {{ .Ipmi.Write }}
- Tags: {{ range $key, $value := .Ipmi.Tags }}{{ $key }}={{ $value }} {{ end }}
- TagsDel: {{ range $key, $value := .Ipmi.TagsDel }}{{ $key }}={{ $value }} {{ end }}
{{- range $index, $netdev := .NetDevs }}
- NetDevs[{{ $index }}]:
- Type: {{ $netdev.Type }}
- OnBoot: {{ $netdev.OnBoot }}
- Manual: {{ $netdev.Manual }}
- Device: {{ $netdev.Device }}
- Hwaddr: {{ $netdev.Hwaddr }}
- Ipaddr: {{ $netdev.Ipaddr }}
@@ -57,9 +54,7 @@ data from other structures.
- Gateway: {{ $netdev.Gateway }}
- MTU: {{ $netdev.MTU }}
- Primary: {{ $netdev.Primary }}
- Default: {{ $netdev.Default }}
- Tags: {{ range $key, $value := $netdev.Tags }}{{ $key }}={{ $value }} {{ end }}
- TagsDel: {{ range $key, $value := $netdev.TagsDel }}{{ $key }}={{ $value }} {{ end }}
{{- end }}
@@ -130,45 +125,46 @@ data from other structures.
{{ range $index, $node := .AllNodes -}}
- AllNodes[{{ $index }}]:
- Id: {{ $node.Id.Get }}
- Comment: {{ $node.Comment.Get }}
- ClusterName: {{ $node.ClusterName.Get }}
- ContainerName: {{ $node.ContainerName.Get }}
- Ipxe: {{ $node.Ipxe.Get }}
- RuntimeOverlay: {{ $node.RuntimeOverlay.Get }}
- SystemOverlay: {{ $node.SystemOverlay.Get }}
- Root: {{ $node.Root.Get }}
- Discoverable: {{ $node.Discoverable.Get }}
- Init: {{ $node.Init.Get }}
- AssetKey: {{ $node.AssetKey.Get }}
- Profiles: {{ $node.Profiles.Get }}
- Tags: {{ range $key, $value := $node.Tags }}{{ $key }}={{ $value.Get }} {{ end }}
- Id: {{ $node.Id }}
- Comment: {{ $node.Comment }}
- ClusterName: {{ $node.ClusterName }}
- ContainerName: {{ $node.ContainerName }}
- Ipxe: {{ $node.Ipxe }}
- RuntimeOverlay: {{ $node.RuntimeOverlay }}
- SystemOverlay: {{ $node.SystemOverlay }}
- Root: {{ $node.Root }}
- Discoverable: {{ $node.Discoverable }}
- Init: {{ $node.Init }}
- AssetKey: {{ $node.AssetKey }}
- Profiles: {{ $node.Profiles }}
- Tags: {{ range $key, $value := $node.Tags }}{{ $key }}={{ $value }} {{ end }}
- Kernel
- Override: {{ $node.Kernel.Override.Get }}
- Args: {{ $node.Kernel.Args.Get }}
- Override: {{ $node.Kernel.Override }}
- Args: {{ $node.Kernel.Args }}
- Ipmi:
- Ipaddr: {{ $node.Ipmi.Ipaddr.Get }}
- Netmask: {{ $node.Ipmi.Netmask.Get }}
- Port: {{ $node.Ipmi.Port.Get }}
- Gateway: {{ $node.Ipmi.Gateway.Get }}
- UserName: {{ $node.Ipmi.UserName.Get }}
- Password: {{ $node.Ipmi.Password.Get }}
- Interface: {{ $node.Ipmi.Interface.Get }}
- Write: {{ $node.Ipmi.Write.Get }}
- Tags: {{ range $key, $value := $node.Ipmi.Tags }}{{ $key }}={{ $value.Get }} {{ end }}
- Ipaddr: {{ $node.Ipmi.Ipaddr }}
- Netmask: {{ $node.Ipmi.Netmask }}
- Port: {{ $node.Ipmi.Port }}
- Gateway: {{ $node.Ipmi.Gateway }}
- UserName: {{ $node.Ipmi.UserName }}
- Password: {{ $node.Ipmi.Password }}
- Interface: {{ $node.Ipmi.Interface }}
- Write: {{ $node.Ipmi.Write }}
- Tags: {{ range $key, $value := $node.Ipmi.Tags }}{{ $key }}={{ $value }} {{ end }}
{{- range $index, $netdev := $node.NetDevs }}
- NetDevs[{{ $index }}]:
- Type: {{ $netdev.Type.Get }}
- OnBoot: {{ $netdev.OnBoot.Get }}
- Device: {{ $netdev.Device.Get }}
- Hwaddr: {{ $netdev.Hwaddr.Get }}
- Ipaddr: {{ $netdev.Ipaddr.Get }}
- Ipaddr6: {{ $netdev.Ipaddr6.Get }}
- Prefix: {{ $netdev.Prefix.Get }}
- Netmask: {{ $netdev.Netmask.Get }}
- Gateway: {{ $netdev.Gateway.Get }}
- MTU: {{ $netdev.MTU.Get }}
- Primary: {{ $netdev.Primary.Get }}
- Tags: {{ range $key, $value := $netdev.Tags }}{{ $key }}={{ $value.Get }} {{ end }}
- Type: {{ $netdev.Type }}
- Manual: {{ $netdev.Manual }}
- Device: {{ $netdev.Device }}
- Hwaddr: {{ $netdev.Hwaddr }}
- Ipaddr: {{ $netdev.Ipaddr }}
- IpCIDR: {{ $netdev.IpCIDR }}
- Ipaddr6: {{ $netdev.Ipaddr6 }}
- Prefix: {{ $netdev.Prefix }}
- Netmask: {{ $netdev.Netmask }}
- Gateway: {{ $netdev.Gateway }}
- MTU: {{ $netdev.MTU }}
- Primary: {{ $netdev.Primary }}
- Tags: {{ range $key, $value := $netdev.Tags }}{{ $key }}={{ $value }} {{ end }}
{{- end }}
{{ end }}