diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 27853726..b2c8ba06 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -88,6 +88,15 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.ClusterName.Set(node.ClusterName) n.Ipxe.Set(node.Ipxe) n.Init.Set(node.Init) + // backward compatiblity for old Ipmi config + n.Ipmi.Ipaddr.Set(node.IpmiIpaddr) + n.Ipmi.Netmask.Set(node.IpmiNetmask) + n.Ipmi.Port.Set(node.IpmiPort) + n.Ipmi.Gateway.Set(node.IpmiGateway) + n.Ipmi.UserName.Set(node.IpmiUserName) + n.Ipmi.Password.Set(node.IpmiPassword) + n.Ipmi.Interface.Set(node.IpmiInterface) + n.Ipmi.Write.SetB(node.IpmiWrite) if node.Ipmi != nil { n.Ipmi.Ipaddr.Set(node.Ipmi.Ipaddr) n.Ipmi.Netmask.Set(node.Ipmi.Netmask) @@ -103,7 +112,10 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.Root.Set(node.Root) n.AssetKey.Set(node.AssetKey) n.Discoverable.Set(node.Discoverable) - + // backward compatibilty + n.Kernel.Args.Set(node.KernelArgs) + n.Kernel.Override.Set(node.KernelOverride) + n.Kernel.Override.Set(node.KernelVersion) if node.Kernel != nil { n.Kernel.Args.Set(node.Kernel.Args) if node.Kernel.Override != "" { @@ -291,6 +303,11 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) { p.ContainerName.Set(profile.ContainerName) p.Ipxe.Set(profile.Ipxe) p.Init.Set(profile.Init) + // backward compatibilty + p.Kernel.Args.Set(profile.KernelArgs) + p.Kernel.Override.Set(profile.KernelOverride) + p.Kernel.Override.Set(profile.KernelVersion) + if profile.Kernel != nil { p.Kernel.Args.Set(profile.Kernel.Args) if profile.Kernel.Override != "" { @@ -299,6 +316,15 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) { p.Kernel.Override.Set(profile.Kernel.Version) } } + // backward compatiblity for old Ipmi config + p.Ipmi.Ipaddr.Set(profile.IpmiIpaddr) + p.Ipmi.Netmask.Set(profile.IpmiNetmask) + p.Ipmi.Port.Set(profile.IpmiPort) + p.Ipmi.Gateway.Set(profile.IpmiGateway) + p.Ipmi.UserName.Set(profile.IpmiUserName) + p.Ipmi.Password.Set(profile.IpmiPassword) + p.Ipmi.Interface.Set(profile.IpmiInterface) + p.Ipmi.Write.SetB(profile.IpmiWrite) if profile.Ipmi != nil { p.Ipmi.Netmask.Set(profile.Ipmi.Netmask) p.Ipmi.Port.Set(profile.Ipmi.Port) diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go index a6c1ee9f..e1e5b326 100644 --- a/internal/pkg/node/datastructure.go +++ b/internal/pkg/node/datastructure.go @@ -23,6 +23,17 @@ type NodeConf struct { ClusterName string `yaml:"cluster name,omitempty"` ContainerName string `yaml:"container name,omitempty"` Ipxe string `yaml:"ipxe template,omitempty"` + KernelVersion string `yaml:"kernel version,omitempty"` + KernelOverride string `yaml:"kernel override,omitempty"` + KernelArgs string `yaml:"kernel args,omitempty"` + IpmiUserName string `yaml:"ipmi username,omitempty"` + IpmiPassword string `yaml:"ipmi password,omitempty"` + IpmiIpaddr string `yaml:"ipmi ipaddr,omitempty"` + IpmiNetmask string `yaml:"ipmi netmask,omitempty"` + IpmiPort string `yaml:"ipmi port,omitempty"` + IpmiGateway string `yaml:"ipmi gateway,omitempty"` + IpmiInterface string `yaml:"ipmi interface,omitempty"` + IpmiWrite bool `yaml:"ipmi write,omitempty"` RuntimeOverlay []string `yaml:"runtime overlay,omitempty"` SystemOverlay []string `yaml:"system overlay,omitempty"` Kernel *KernelConf `yaml:"kernel,omitempty"`