kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed formatting across entire project

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-08-21 08:04:47 -07:00
parent 4d37c87c7b
commit a82e1b0ea5
20 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bash_completion/bash_completion.go
View File

@@ -3,8 +3,8 @@ package main
import (
"fmt"
"os"
"github.com/hpcng/warewulf/internal/app/wwctl"
"os"
)
func main() {

6
cmd/man_page/man_page.go
View File

@@ -2,13 +2,13 @@
package main
import (
"fmt"
"os"
"fmt"
"github.com/hpcng/warewulf/internal/app/wwctl"
"os"
)
func main() {
if err := wwctl.GenManTree(os.Args[1]); err != nil {
fmt.Println(err)
return

1
cmd/wwctl/main.go
View File

@@ -9,4 +9,3 @@ func main() {
root.Execute()
}

1
internal/app/wwctl/container/exec/child/main.go
View File

@@ -1,3 +1,4 @@
//go:build linux
// +build linux
package child

1
internal/app/wwctl/container/exec/child/non-Linux.go
View File

@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package child

1
internal/app/wwctl/container/exec/main.go
View File

@@ -1,3 +1,4 @@
//go:build linux
// +build linux
package exec

1
internal/app/wwctl/container/exec/non-linux.go
View File

@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package exec

14
internal/app/wwctl/node/add/main.go
View File

@@ -24,15 +24,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
fmt.Printf("Added node: %s\n", a)
if SetClusterName != "" {
wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting cluster name to: %s\n", n.Id.Get(), SetClusterName)
n.ClusterName.Set(SetClusterName)
if SetClusterName != "" {
wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting cluster name to: %s\n", n.Id.Get(), SetClusterName)
n.ClusterName.Set(SetClusterName)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
}
}
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
}
}
if SetIpaddr != "" {
if SetNetDev == "" {

4
internal/app/wwctl/node/delete/root.go
View File

@@ -11,8 +11,8 @@ var (
RunE: CobraRunE,
Aliases: []string{"rm", "del"},
}
SetYes bool
SetForce string
SetYes bool
SetForce string
)
func init() {

1
internal/app/wwctl/node/list/main.go
View File

@@ -51,7 +51,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "IpmiUserName", node.IpmiUserName.Source(), node.IpmiUserName.Print())
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "IpmiInterface", node.IpmiInterface.Source(), node.IpmiInterface.Print())
for name, netdev := range node.NetDevs {
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), name+":HWADDR", netdev.Hwaddr.Source(), netdev.Hwaddr.Print())
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), name+":IPADDR", netdev.Ipaddr.Source(), netdev.Ipaddr.Print())

2
internal/app/wwctl/node/sensors/power.go
View File

@@ -58,7 +58,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
User: node.IpmiUserName.Get(),
Password: node.IpmiPassword.Get(),
Interface: ipmiInterface,
AuthType: "MD5",
AuthType: "MD5",
}
fullFlag := full

2
internal/app/wwctl/overlay/list/main.go
View File

@@ -117,7 +117,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
var unconfigured bool
for overlay, _ := range set {
for overlay := range set {
var overlayPath string
if SystemOverlay == true {

2
internal/app/wwctl/power/cycle/power.go
View File

@@ -58,7 +58,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
User: node.IpmiUserName.Get(),
Password: node.IpmiPassword.Get(),
Interface: ipmiInterface,
AuthType: "MD5",
AuthType: "MD5",
}
batchpool.Submit(func() {

2
internal/app/wwctl/power/on/power.go
View File

@@ -58,7 +58,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
User: node.IpmiUserName.Get(),
Password: node.IpmiPassword.Get(),
Interface: ipmiInterface,
AuthType: "MD5",
AuthType: "MD5",
}
batchpool.Submit(func() {

2
internal/app/wwctl/power/status/power.go
View File

@@ -58,7 +58,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
User: node.IpmiUserName.Get(),
Password: node.IpmiPassword.Get(),
Interface: ipmiInterface,
AuthType: "MD5",
AuthType: "MD5",
}
batchpool.Submit(func() {

10
internal/app/wwctl/root.go
View File

@@ -1,7 +1,6 @@
package wwctl
import (
"io"
"github.com/hpcng/warewulf/internal/app/wwctl/configure"
"github.com/hpcng/warewulf/internal/app/wwctl/container"
"github.com/hpcng/warewulf/internal/app/wwctl/kernel"
@@ -14,6 +13,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
"io"
)
var (
@@ -64,13 +64,13 @@ func rootPersistentPreRunE(cmd *cobra.Command, args []string) error {
// GenBashCompletionFile
func GenBashCompletion(w io.Writer) error {
return rootCmd.GenBashCompletion(w)
return rootCmd.GenBashCompletion(w)
}
func GenManTree(fileName string) error{
func GenManTree(fileName string) error {
header := &doc.GenManHeader{
Title: "MINE",
Title: "MINE",
Section: "1",
}
return doc.GenManTree(rootCmd,header,fileName)
return doc.GenManTree(rootCmd, header, fileName)
}

6
internal/pkg/node/datastructure.go
View File

@@ -29,7 +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"`
IpmiInterface string `yaml:"ipmi interface,omitempty"`
RuntimeOverlay string `yaml:"runtime overlay,omitempty"`
SystemOverlay string `yaml:"system overlay,omitempty"`
Init string `yaml:"init,omitempty"`
@@ -107,8 +107,8 @@ func init() {
c, err := os.OpenFile(ConfigFile, os.O_RDWR|os.O_CREATE, 0644)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not create new configuration file: %s\n", err)
// just return silently, as init is also called for bash_completion
return
// just return silently, as init is also called for bash_completion
return
}
fmt.Fprintf(c, "nodeprofiles:\n")

2
internal/pkg/node/modifiers.go
View File

@@ -159,7 +159,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].Profiles = profile.Profiles
config.NodeProfiles[profileID].NetDevs = make(map[string]*NetDevs)
config.NodeProfiles[profileID].Keys = make(map[string]string)
for devname, netdev := range profile.NetDevs {

16
internal/pkg/power/ipmitool.go
View File

@@ -16,8 +16,8 @@ type IPMI struct {
User string
Password string
AuthType string
Interface string
result IPMIResult
Interface string
result IPMIResult
}
func (ipmi *IPMI) Result() (string, error) {
@@ -28,9 +28,9 @@ func (ipmi *IPMI) Command(ipmiArgs []string) ([]byte, error) {
var args []string
if ipmi.Interface == "" {
ipmi.Interface = "lanplus"
}
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("ipmitool", args...)
@@ -41,9 +41,9 @@ func (ipmi *IPMI) InteractiveCommand(ipmiArgs []string) error {
var args []string
if ipmi.Interface == "" {
ipmi.Interface = "lan"
}
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...)

5
internal/pkg/warewulfconf/datastructure.go
View File

@@ -1,7 +1,6 @@
package warewulfconf
import (
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
)
@@ -51,7 +50,7 @@ func init() {
//TODO: Check to make sure nodes.conf is found
if util.IsFile(ConfigFile) == false {
wwlog.Printf(wwlog.ERROR, "Configuration file not found: %s\n", ConfigFile)
// fail silently as this also called by bash_completion
return
// fail silently as this also called by bash_completion
return
}
}