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

Add IPv6 support for Dnsmasq and NetworkManager

Browse Source 
Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>
This commit is contained in:
Timothy Middelkoop
2025-11-27 01:56:18 +00:00
parent 07eee48a6a
commit 4f58845a9e
25 changed files with 417 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/pkg/overlay/datastructure.go
View File

@@ -25,12 +25,13 @@ type TemplateStruct struct {
BuildSource string
Ipaddr string
IpCIDR string
Ipaddr6 string
IpCIDR6 string
Netmask string
Network string
NetworkCIDR string
Overlay string
Ipaddr6 string
IpCIDR6 string
PrefixLen6 string
Ipv6 bool
Dhcp warewulfconf.DHCPConf
Nfs warewulfconf.NFSConf
@@ -70,14 +71,15 @@ func InitStruct(overlayName string, nodeData node.Node, allNodes []node.Node) (T
tstruct.Warewulf = *controller.Warewulf
tstruct.Ipaddr = controller.Ipaddr
tstruct.IpCIDR = controller.IpCIDR()
tstruct.Ipaddr6 = controller.Ipaddr6
tstruct.IpCIDR6 = controller.IpCIDR6
if controller.Ipaddr6 != "" && controller.IpCIDR6 != "" {
tstruct.Ipv6 = true
}
tstruct.Netmask = controller.Netmask
tstruct.Network = controller.Network
tstruct.NetworkCIDR = controller.NetworkCIDR()
tstruct.Ipaddr6 = controller.Ipaddr6
tstruct.IpCIDR6 = controller.IpCIDR6()
tstruct.PrefixLen6 = controller.PrefixLen6
if controller.Ipaddr6 != "" && controller.PrefixLen6 != "" {
tstruct.Ipv6 = true
}
// init some convenience vars
tstruct.Id = nodeData.Id()
tstruct.Hostname = nodeData.Id()