File added-configureable-ipmiinterface-used-by-ipmit... of Package warewulf4

Overview Repositories Revisions Requests Users Attributes Meta

File added-configureable-ipmiinterface-used-by-ipmitool.patch of Package warewulf4 (Revision 77f2579fa4eaf49199c1c3eaab27f3c6)

Currently displaying revision 77f2579fa4eaf49199c1c3eaab27f3c6 , Show latest

From d6183fb1d92c3b0d3264126b693e3f33b707929d Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Tue, 3 Aug 2021 11:30:26 +0200
Subject: [PATCH] added configureable ipmiinterface used by ipmitool ipmitool
 is now searched from $PATH, so that self compiled ipmitool can be used

---
 internal/app/wwctl/node/set/main.go    |  5 +++++
 internal/app/wwctl/node/set/root.go    |  2 ++
 internal/app/wwctl/profile/set/main.go |  5 +++++
 internal/app/wwctl/profile/set/root.go |  2 ++
 internal/pkg/node/datastructure.go     |  2 ++
 internal/pkg/power/ipmitool.go         | 16 ++++++++++++----
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/internal/app/wwctl/node/set/main.go b/internal/app/wwctl/node/set/main.go
index 76973c8..fc16ba3 100644
--- a/internal/app/wwctl/node/set/main.go
+++ b/internal/app/wwctl/node/set/main.go
@@ -175,6 +175,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			n.IpmiPassword.Set(SetIpmiPassword)
 		}
 
+		if SetIpmiInterface != "" {
+			wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting IPMI IP interface to: %s\n", n.Id.Get(), SetIpmiInterface)
+			n.IpmiInterface.Set(SetIpmiInterface)
+		}
+
 		if SetDiscoverable == true {
 			wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting node to discoverable\n", n.Id.Get())
 			n.Discoverable.SetB(true)
diff --git a/internal/app/wwctl/node/set/root.go b/internal/app/wwctl/node/set/root.go
index 48c1531..fe41253 100644
--- a/internal/app/wwctl/node/set/root.go
+++ b/internal/app/wwctl/node/set/root.go
@@ -31,6 +31,7 @@ var (
 	SetIpmiGateway    string
 	SetIpmiUsername   string
 	SetIpmiPassword   string
+  SetIpmiInterface  string
 	SetNodeAll        bool
 	SetYes            bool
 	SetProfile        string
@@ -63,6 +64,7 @@ func init() {
 	baseCmd.PersistentFlags().StringVar(&SetIpmiGateway, "ipmigateway", "", "Set the node's IPMI gateway")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiUsername, "ipmiuser", "", "Set the node's IPMI username")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiPassword, "ipmipass", "", "Set the node's IPMI password")
+	baseCmd.PersistentFlags().StringVar(&SetIpmiInterface, "ipmiinterface", "", "Set the node's IPMI interface (defaults to lan if empty)")
 
 	baseCmd.PersistentFlags().StringSliceVar(&SetAddProfile, "addprofile", []string{}, "Add Profile(s) to node")
 	baseCmd.PersistentFlags().StringSliceVar(&SetDelProfile, "delprofile", []string{}, "Remove Profile(s) to node")
diff --git a/internal/app/wwctl/profile/set/main.go b/internal/app/wwctl/profile/set/main.go
index b7a2eda..1a2b700 100644
--- a/internal/app/wwctl/profile/set/main.go
+++ b/internal/app/wwctl/profile/set/main.go
@@ -132,6 +132,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			p.IpmiPassword.Set(SetIpmiPassword)
 		}
 
+		if SetIpmiInterface != "" {
+			wwlog.Printf(wwlog.VERBOSE, "Profile: %s, Setting IPMI username to: %s\n", p.Id, SetIpmiInterface)
+			p.IpmiInterface.Set(SetIpmiInterface)
+		}
+
 		if SetNetDevDel == true {
 			if SetNetDev == "" {
 				wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
diff --git a/internal/app/wwctl/profile/set/root.go b/internal/app/wwctl/profile/set/root.go
index 2bc4b6e..cf152aa 100644
--- a/internal/app/wwctl/profile/set/root.go
+++ b/internal/app/wwctl/profile/set/root.go
@@ -25,6 +25,7 @@ var (
 	SetIpmiGateway    string
 	SetIpmiUsername   string
 	SetIpmiPassword   string
+	SetIpmiInterface  string
 	SetNetDev         string
 	SetIpaddr         string
 	SetNetmask        string
@@ -56,6 +57,7 @@ func init() {
 	baseCmd.PersistentFlags().StringVar(&SetIpmiGateway, "ipmigateway", "", "Set the node's IPMI gateway")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiUsername, "ipmiuser", "", "Set the node's IPMI username")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiPassword, "ipmipass", "", "Set the node's IPMI password")
+	baseCmd.PersistentFlags().StringVar(&SetIpmiInterface, "ipmiinterface", "", "Set the node's IPMI interface (defaults to lan if empty)")
 
 	baseCmd.PersistentFlags().StringVarP(&SetNetDev, "netdev", "N", "", "Define the network device to configure")
 	baseCmd.PersistentFlags().StringVarP(&SetIpaddr, "ipaddr", "I", "", "Set the node's network device IP address")
diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go
index 406c656..079434b 100644
--- a/internal/pkg/node/datastructure.go
+++ b/internal/pkg/node/datastructure.go
@@ -29,6 +29,7 @@ type NodeConf struct {
 	IpmiIpaddr     string              `yaml:"ipmi ipaddr,omitempty"`
 	IpmiNetmask    string              `yaml:"ipmi netmask,omitempty"`
 	IpmiGateway    string              `yaml:"ipmi gateway,omitempty"`
+  IpmiInterface  string              `yaml:"ipmi interface,omitempty"`
 	RuntimeOverlay string              `yaml:"runtime overlay,omitempty"`
 	SystemOverlay  string              `yaml:"system overlay,omitempty"`
 	Init           string              `yaml:"init,omitempty"`
@@ -75,6 +76,7 @@ type NodeInfo struct {
 	IpmiGateway    Entry
 	IpmiUserName   Entry
 	IpmiPassword   Entry
+	IpmiInterface  Entry
 	RuntimeOverlay Entry
 	SystemOverlay  Entry
 	Root           Entry
diff --git a/internal/pkg/power/ipmitool.go b/internal/pkg/power/ipmitool.go
index aac1ca6..cafb9bb 100644
--- a/internal/pkg/power/ipmitool.go
+++ b/internal/pkg/power/ipmitool.go
@@ -16,6 +16,7 @@ type IPMI struct {
 	User     string
 	Password string
 	AuthType string
+  Interface string
 	result   IPMIResult
 }
 
@@ -27,9 +28,12 @@ func (ipmi *IPMI) Command(ipmiArgs []string) ([]byte, error) {
 
 	var args []string
 
-	args = append(args, "-I", "lan", "-H", ipmi.HostName, "-U", ipmi.User, "-P", ipmi.Password)
+  if ipmi.Interface == "" {
+    ipmi.Interface = "lanplus"
+  }
+	args = append(args, "-I", ipmi.Interface, "-H", ipmi.HostName, "-U", ipmi.User, "-P", ipmi.Password)
 	args = append(args, ipmiArgs...)
-	ipmiCmd := exec.Command("/usr/bin/ipmitool", args...)
+	ipmiCmd := exec.Command("ipmitool", args...)
 	return ipmiCmd.CombinedOutput()
 }
 
@@ -37,9 +41,13 @@ func (ipmi *IPMI) InteractiveCommand(ipmiArgs []string) error {
 
 	var args []string
 
-	args = append(args, "-I", "lanplus", "-H", ipmi.HostName, "-U", ipmi.User, "-P", ipmi.Password)
+  if ipmi.Interface == "" {
+    ipmi.Interface = "lan"
+  }
+
+	args = append(args, "-I", ipmi.Interface, "-H", ipmi.HostName, "-U", ipmi.User, "-P", ipmi.Password)
 	args = append(args, ipmiArgs...)
-	ipmiCmd := exec.Command("/usr/bin/ipmitool", args...)
+	ipmiCmd := exec.Command("ipmitool", args...)
 	ipmiCmd.Stdout = os.Stdout
 	ipmiCmd.Stdin = os.Stdin
 	ipmiCmd.Stderr = os.Stderr
-- 
2.32.0

Places

File added-configureable-ipmiinterface-used-by-ipmitool.patch of Package warewulf4 (Revision 77f2579fa4eaf49199c1c3eaab27f3c6)

Places