diff --git a/internal/app/wwctl/ready/main.go b/internal/app/wwctl/ready/main.go index 2df4b33d..f77481f4 100644 --- a/internal/app/wwctl/ready/main.go +++ b/internal/app/wwctl/ready/main.go @@ -27,7 +27,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { os.Exit(1) } - fmt.Printf("%-25s %-10s %-6s %-6s %-6s %-6s %-6s\n", "NODE NAME", "STATUS", "VNFS", "KERNEL", "KMODS", "SYS-OL", "RUN-OL") + fmt.Printf("%-25s %-10s %-6s %-6s %-6s %-6s %-6s\n", "NODE NAME", "READY", "VNFS", "KERNEL", "KMODS", "SYS-OL", "RUN-OL") for _, node := range nodes { var vnfs_good bool @@ -35,7 +35,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { var kmods_good bool var systemo_good bool var runtimeo_good bool - status := true + ready := true if node.ContainerName.Get() != "" { vnfsImage := container.ImageFile(node.ContainerName.Get()) @@ -43,11 +43,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error { if util.IsFile(vnfsImage) == true { vnfs_good = true } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "VNFS not found: %s, %s\n", node.Id.Get(), vnfsImage) } } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Node Kernel not defined: %s\n", node.Id.Get()) } @@ -55,17 +55,17 @@ func CobraRunE(cmd *cobra.Command, args []string) error { if util.IsFile(kernel.KernelImage(node.KernelVersion.Get())) == true { kernel_good = true } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Node Kernel not found: %s, %s\n", node.Id.Get(), node.KernelVersion.Get()) } if util.IsFile(kernel.KmodsImage(node.KernelVersion.Get())) == true { kmods_good = true } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Node Kmods not found: %s, %s\n", node.Id.Get(), node.KernelVersion.Get()) } } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Node Kernel version not defined: %s\n", node.Id.Get()) } @@ -73,11 +73,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error { if util.IsFile(config.SystemOverlayImage(node.Id.Get())) == true { systemo_good = true } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "System Overlay not found: %s\n", config.SystemOverlayImage(node.Id.Get())) } } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "System Overlay not defined: %s\n", node.Id.Get()) } @@ -85,15 +85,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error { if util.IsFile(config.RuntimeOverlayImage(node.Id.Get())) == true { runtimeo_good = true } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Runtime Overlay not found: %s\n", config.RuntimeOverlaySource(node.Id.Get())) } } else { - status = false + ready = false wwlog.Printf(wwlog.VERBOSE, "Runtime Overlay not defined: %s\n", node.Id.Get()) } - fmt.Printf("%-25s %-10t %-6t %-6t %-6t %-6t %-6t\n", node.Id.Get(), status, vnfs_good, kernel_good, kmods_good, systemo_good, runtimeo_good) + fmt.Printf("%-25s %-10t %-6t %-6t %-6t %-6t %-6t\n", node.Id.Get(), ready, vnfs_good, kernel_good, kmods_good, systemo_good, runtimeo_good) } return nil