Fixups for NodeDB

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

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