From 80e58c08ed28ba029011777d73ce06d0c4b8ced9 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Fri, 20 Aug 2021 07:58:44 -0700 Subject: [PATCH] Git formatting fixes --- internal/pkg/overlay/overlay.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go index fc9c64a5..a8b84b19 100644 --- a/internal/pkg/overlay/overlay.go +++ b/internal/pkg/overlay/overlay.go @@ -3,13 +3,13 @@ package overlay import ( "fmt" "io/ioutil" - "net" + "net" "os" "os/exec" "path" "path/filepath" "regexp" - "strconv" + "strconv" "strings" "text/template" @@ -23,7 +23,7 @@ import ( type TemplateStruct struct { Id string Hostname string - ClusterName string + ClusterName string Container string Init string Root string @@ -33,7 +33,7 @@ type TemplateStruct struct { IpmiUserName string IpmiPassword string NetDevs map[string]*node.NetDevs - Keys map[string]string + Keys map[string]string AllNodes []node.NodeInfo } @@ -162,12 +162,12 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error { t.NetDevs[devname].Gateway = netdev.Gateway.Get() t.NetDevs[devname].Type = netdev.Type.Get() t.NetDevs[devname].Default = netdev.Default.GetB() - mask := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4()) - ipaddr := net.ParseIP(netdev.Ipaddr.Get()).To4() - netaddr := net.IPNet{IP: ipaddr,Mask: mask} - netPrefix, _ := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4()).Size() - t.NetDevs[devname].Prefix = strconv.Itoa(netPrefix) - t.NetDevs[devname].IpCIDR = netaddr.String() + mask := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4()) + ipaddr := net.ParseIP(netdev.Ipaddr.Get()).To4() + netaddr := net.IPNet{IP: ipaddr, Mask: mask} + netPrefix, _ := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4()).Size() + t.NetDevs[devname].Prefix = strconv.Itoa(netPrefix) + t.NetDevs[devname].IpCIDR = netaddr.String() } for keyname, key := range n.Keys {