From 6968744e55361ac5ec7582f4d1cbe841be9edaca Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Tue, 1 Dec 2020 13:05:14 -0800 Subject: [PATCH] Fixups for NodeDB --- internal/pkg/node/constructors.go | 2 ++ internal/pkg/node/datastructure.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 5ac16bd2..5e0b98f9 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -147,6 +147,7 @@ func (self *nodeYaml) FindAllControllers() ([]ControllerInfo, error) { c.Id = controllername c.Ipaddr = controller.Ipaddr + //TODO: Is there a better way to do this, cause EWWW! c.Services = struct { Warewulfd struct { Port string @@ -157,6 +158,7 @@ func (self *nodeYaml) FindAllControllers() ([]ControllerInfo, error) { } Dhcp struct { Enabled bool + Template string RangeStart string RangeEnd string ConfigFile string diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go index fed2145c..b136f005 100644 --- a/internal/pkg/node/datastructure.go +++ b/internal/pkg/node/datastructure.go @@ -41,6 +41,7 @@ type ControllerConf struct { } `yaml:"warewulf"` Dhcp struct { Enabled bool `yaml:"enabled,omitempty"` + Template string `yaml:"template,omitempty"` RangeStart string `yaml:"range start,omitempty"` RangeEnd string `yaml:"range end,omitempty"` ConfigFile string `yaml:"config file,omitempty"` @@ -102,6 +103,7 @@ type NodeConf struct { type NetDevs struct { Type string `yaml:"type,omitempty"` + Default bool `yaml:"default"` Hwaddr string Ipaddr string Netmask string @@ -158,6 +160,7 @@ type ControllerInfo struct { } Dhcp struct { Enabled bool + Template string RangeStart string RangeEnd string ConfigFile string