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

Updates to vnfs command for NodeDB updates

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-11-26 19:18:13 -08:00
parent 2e11c21566
commit 4ba0cb7bcd
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/app/wwctl/vnfs/build/main.go
View File

@@ -28,7 +28,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
for _, node := range nodes {
set[node.Vnfs.String()] ++
if node.Vnfs.Defined() == true {
set[node.Vnfs.Get()] ++
}
}
} else if BuildAll == true {
@@ -40,7 +42,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
for _, node := range nodes {
set[node.Vnfs.String()] ++
if node.Vnfs.Defined() == true {
set[node.Vnfs.Get()] ++
}
}
} else if len(args) == 1 {

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

@@ -20,7 +20,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
nodemap := make(map[string]int)
for _, n := range nodes {
nodemap[n.Vnfs.String()] ++
nodemap[n.Vnfs.Get()] ++
}
images, _ := ioutil.ReadDir(config.VnfsImageParentDir())

4
internal/app/wwctl/vnfs/list/root.go
View File

@@ -14,8 +14,8 @@ var (
)
func init() {
baseCmd.PersistentFlags().BoolVarP(&SystemOverlay, "system", "s", false, "Show System Overlays as well")
baseCmd.PersistentFlags().BoolVarP(&BuildAll, "all", "a", false, "Build all overlays (runtime and system)")
//baseCmd.PersistentFlags().BoolVarP(&SystemOverlay, "system", "s", false, "Show System Overlays as well")
//baseCmd.PersistentFlags().BoolVarP(&BuildAll, "all", "a", false, "Build all overlays (runtime and system)")
}