Merge pull request #385 from mslacken/network-cidr

add NetworkCIDR for overlays
This commit is contained in:
Christian Goll
2022-04-14 13:57:23 +02:00
committed by GitHub
2 changed files with 3 additions and 0 deletions

View File

@@ -31,6 +31,7 @@ type TemplateStruct struct {
Ipaddr6 string
Netmask string
Network string
NetworkCIDR string
Ipv6 bool
Dhcp warewulfconf.DhcpConf
Nfs warewulfconf.NfsConf

View File

@@ -289,6 +289,8 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
tstruct.Ipaddr6 = controller.Ipaddr6
tstruct.Netmask = controller.Netmask
tstruct.Network = controller.Network
netaddrStruct := net.IPNet{IP: net.ParseIP(controller.Network), Mask: net.IPMask(net.ParseIP(controller.Netmask))}
tstruct.NetworkCIDR = netaddrStruct.String()
if controller.Ipaddr6 != "" {
tstruct.Ipv6 = true
} else {