diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 4cffec63..6746aa08 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -96,7 +96,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.Ipmi.UserName.Set(node.IpmiUserName) n.Ipmi.Password.Set(node.IpmiPassword) n.Ipmi.Interface.Set(node.IpmiInterface) - n.Ipmi.Write.SetB(node.IpmiWrite) + n.Ipmi.Write.Set(node.IpmiWrite) // delete deprectated structures so that they do not get unmarshalled node.IpmiIpaddr = "" node.IpmiNetmask = "" @@ -104,7 +104,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { node.IpmiUserName = "" node.IpmiPassword = "" node.IpmiInterface = "" - node.IpmiWrite = false + node.IpmiWrite = "" if node.Ipmi != nil { n.Ipmi.Ipaddr.Set(node.Ipmi.Ipaddr) @@ -114,7 +114,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.Ipmi.UserName.Set(node.Ipmi.UserName) n.Ipmi.Password.Set(node.Ipmi.Password) n.Ipmi.Interface.Set(node.Ipmi.Interface) - n.Ipmi.Write.SetB(node.Ipmi.Write) + n.Ipmi.Write.Set(node.Ipmi.Write) } n.SystemOverlay.SetSlice(node.SystemOverlay) n.RuntimeOverlay.SetSlice(node.RuntimeOverlay) @@ -223,7 +223,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.Ipmi.UserName.SetAlt(config.NodeProfiles[p].Ipmi.UserName, p) n.Ipmi.Password.SetAlt(config.NodeProfiles[p].Ipmi.Password, p) n.Ipmi.Interface.SetAlt(config.NodeProfiles[p].Ipmi.Interface, p) - n.Ipmi.Write.SetAltB(config.NodeProfiles[p].Ipmi.Write, p) + n.Ipmi.Write.SetAlt(config.NodeProfiles[p].Ipmi.Write, p) } n.SystemOverlay.SetAltSlice(config.NodeProfiles[p].SystemOverlay, p) n.RuntimeOverlay.SetAltSlice(config.NodeProfiles[p].RuntimeOverlay, p) @@ -339,7 +339,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) { p.Ipmi.UserName.Set(profile.IpmiUserName) p.Ipmi.Password.Set(profile.IpmiPassword) p.Ipmi.Interface.Set(profile.IpmiInterface) - p.Ipmi.Write.SetB(profile.IpmiWrite) + p.Ipmi.Write.Set(profile.IpmiWrite) // delete deprectated structures so that they do not get unmarshalled profile.IpmiIpaddr = "" profile.IpmiNetmask = "" @@ -347,7 +347,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) { profile.IpmiUserName = "" profile.IpmiPassword = "" profile.IpmiInterface = "" - profile.IpmiWrite = false + profile.IpmiWrite = "" if profile.Ipmi != nil { p.Ipmi.Netmask.Set(profile.Ipmi.Netmask) p.Ipmi.Port.Set(profile.Ipmi.Port) @@ -355,7 +355,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) { p.Ipmi.UserName.Set(profile.Ipmi.UserName) p.Ipmi.Password.Set(profile.Ipmi.Password) p.Ipmi.Interface.Set(profile.Ipmi.Interface) - p.Ipmi.Write.SetB(profile.Ipmi.Write) + p.Ipmi.Write.Set(profile.Ipmi.Write) } p.RuntimeOverlay.SetSlice(profile.RuntimeOverlay) p.SystemOverlay.SetSlice(profile.SystemOverlay) diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go index e1e5b326..11f83c60 100644 --- a/internal/pkg/node/datastructure.go +++ b/internal/pkg/node/datastructure.go @@ -33,7 +33,7 @@ type NodeConf struct { IpmiPort string `yaml:"ipmi port,omitempty"` IpmiGateway string `yaml:"ipmi gateway,omitempty"` IpmiInterface string `yaml:"ipmi interface,omitempty"` - IpmiWrite bool `yaml:"ipmi write,omitempty"` + IpmiWrite string `yaml:"ipmi write,omitempty"` RuntimeOverlay []string `yaml:"runtime overlay,omitempty"` SystemOverlay []string `yaml:"system overlay,omitempty"` Kernel *KernelConf `yaml:"kernel,omitempty"` @@ -56,7 +56,7 @@ type IpmiConf struct { Port string `yaml:"port,omitempty"` Gateway string `yaml:"gateway,omitempty"` Interface string `yaml:"interface,omitempty"` - Write bool `yaml:"write,omitempty"` + Write string `yaml:"write,omitempty"` } type KernelConf struct { Version string `yaml:"version,omitempty"` diff --git a/internal/pkg/node/modifiers.go b/internal/pkg/node/modifiers.go index 5ab78fd5..962d8706 100644 --- a/internal/pkg/node/modifiers.go +++ b/internal/pkg/node/modifiers.go @@ -79,7 +79,7 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error { config.Nodes[nodeID].Ipmi.UserName = node.Ipmi.UserName.GetReal() config.Nodes[nodeID].Ipmi.Password = node.Ipmi.Password.GetReal() config.Nodes[nodeID].Ipmi.Interface = node.Ipmi.Interface.GetReal() - config.Nodes[nodeID].Ipmi.Write = node.Ipmi.Write.GetB() + config.Nodes[nodeID].Ipmi.Write = node.Ipmi.Write.GetReal() } config.Nodes[nodeID].RuntimeOverlay = node.RuntimeOverlay.GetRealSlice() config.Nodes[nodeID].SystemOverlay = node.SystemOverlay.GetRealSlice() @@ -185,7 +185,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error { config.NodeProfiles[profileID].Ipmi.UserName = profile.Ipmi.UserName.GetReal() config.NodeProfiles[profileID].Ipmi.Password = profile.Ipmi.Password.GetReal() config.NodeProfiles[profileID].Ipmi.Interface = profile.Ipmi.Interface.GetReal() - config.NodeProfiles[profileID].Ipmi.Write = profile.Ipmi.Interface.GetB() + config.NodeProfiles[profileID].Ipmi.Write = profile.Ipmi.Interface.GetReal() } config.NodeProfiles[profileID].RuntimeOverlay = profile.RuntimeOverlay.GetRealSlice() config.NodeProfiles[profileID].SystemOverlay = profile.SystemOverlay.GetRealSlice() diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go index 732cbd5e..1c95cbb5 100644 --- a/internal/pkg/overlay/overlay.go +++ b/internal/pkg/overlay/overlay.go @@ -245,7 +245,7 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir tstruct.Ipmi.UserName = nodeInfo.Ipmi.UserName.Get() tstruct.Ipmi.Password = nodeInfo.Ipmi.Password.Get() tstruct.Ipmi.Interface = nodeInfo.Ipmi.Interface.Get() - tstruct.Ipmi.Write = nodeInfo.Ipmi.Write.GetB() + tstruct.Ipmi.Write = nodeInfo.Ipmi.Write.Get() tstruct.RuntimeOverlay = nodeInfo.RuntimeOverlay.Print() tstruct.SystemOverlay = nodeInfo.SystemOverlay.Print() tstruct.NetDevs = make(map[string]*node.NetDevs)