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

Remove unused/unneeded Ipv6net config

Browse Source 
Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>
This commit is contained in:
Timothy Middelkoop
2025-11-16 15:07:34 +00:00
parent 3868c72337
commit f9f8fe3673
3 changed files with 4 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/pkg/config/root.go
View File

@@ -29,7 +29,6 @@ type WarewulfYaml struct {
Ipaddr6 string `yaml:"ipaddr6,omitempty"`
Netmask string `yaml:"netmask,omitempty"`
Network string `yaml:"network,omitempty"`
Ipv6net string `yaml:"ipv6net,omitempty"`
Fqdn string `yaml:"fqdn,omitempty"`
Warewulf *WarewulfConf `yaml:"warewulf,omitempty"`
API *APIConf `yaml:"api,omitempty"`
@@ -141,11 +140,7 @@ func (conf *WarewulfYaml) Parse(data []byte, autodetect bool) error {
}
if conf.Ipaddr6 != "" {
if _, network, err := net.ParseCIDR(conf.Ipaddr6); err == nil {
if conf.Ipv6net == "" {
conf.Ipv6net = network.IP.String()
}
} else {
if _, _, err := net.ParseCIDR(conf.Ipaddr6); err != nil {
return fmt.Errorf("invalid ipv6 address: must use CIDR notation: %s", conf.Ipaddr6)
}
}