Git formatting fixes
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user