From eb19627e13b66a01a42b9f071badff63de686709 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Tue, 1 Dec 2020 18:24:31 -0800
Subject: [PATCH] Update templates for IPMI

---
 internal/pkg/overlay/overlay.go | 18 +++++++++++++-----
 overlays/system/default/ipmi.ww | 10 ++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go
index f2346d68..528e3017 100644
--- a/internal/pkg/overlay/overlay.go
+++ b/internal/pkg/overlay/overlay.go
@@ -19,11 +19,15 @@ import (
 
 type TemplateStruct struct {
 	Self struct {
-		Fqdn      string
-		Hostname  string
-		GroupName string
-		Vnfs      string
-		NetDevs   map[string]*node.NetDevs
+		Fqdn         string
+		Hostname     string
+		GroupName    string
+		Vnfs         string
+		IpmiIpaddr   string
+		IpmiNetmask  string
+		IpmiUserName string
+		IpmiPassword string
+		NetDevs      map[string]*node.NetDevs
 	}
 	AllNodes []node.NodeInfo
 }
@@ -134,6 +138,10 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 		t.Self.Hostname = node.HostName.Get()
 		t.Self.GroupName = node.Gid.Get()
 		t.Self.Vnfs = node.Vnfs.Get()
+		t.Self.IpmiIpaddr = node.IpmiIpaddr.Get()
+		t.Self.IpmiNetmask = node.IpmiNetmask.Get()
+		t.Self.IpmiUserName = node.IpmiUserName.Get()
+		t.Self.IpmiPassword = node.IpmiPassword.Get()
 		t.Self.NetDevs = node.NetDevs
 		t.AllNodes = allNodes
 
diff --git a/overlays/system/default/ipmi.ww b/overlays/system/default/ipmi.ww
index 261ac13b..afd051bb 100755
--- a/overlays/system/default/ipmi.ww
+++ b/overlays/system/default/ipmi.ww
@@ -8,15 +8,13 @@ if [ ! -e /dev/ipmi0 ]; then
     ls -la /dev/ipmi0
 fi
 
-IP="{{.Self.IpmiIpaddr}}"
-NETMASK="{{.Self.IpmiNetmask}}"
-GATEWAY="{{.Self.NetDevs.eth0.Gateway}}"
-USER="{{.Self.IpmiUserName}}"
-PASS="{{.Self.IpmiPassword}}"
+IP="{{$.Self.IpmiIpaddr}}"
+NETMASK="{{$.Self.IpmiNetmask}}"
+USER="{{$.Self.IpmiUserName}}"
+PASS="{{$.Self.IpmiPassword}}"
 
 echo IP is $IP
 echo NETMASK is $NETMASK
-echo GATEWAY is $GATEWAY
 echo USER is $USER
 echo PASS is $PASS