diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs index 8dad35d5009e12f17d278fd81312c48f0ac58957..89432fc390a27772fb62b13a50756f200ad43688 100644 --- a/Ganeti/HTools/CLI.hs +++ b/Ganeti/HTools/CLI.hs @@ -195,7 +195,7 @@ oInstFile = Option "i" ["instances"] oNodeSim :: OptType oNodeSim = Option "" ["simulate"] (ReqArg (\ f o -> Ok o { optNodeSim = Just f }) "SPEC") - "simulate an empty cluster, given as 'num_nodes,disk,memory,cpus'" + "simulate an empty cluster, given as 'num_nodes,disk,ram,cpu'" oRapiMaster :: OptType oRapiMaster = Option "m" ["master"] @@ -297,12 +297,11 @@ oTieredSpec = Option "" ["tiered-alloc"] prs <- mapM (tryRead "tiered specs") sp tspec <- case prs of - [cpu, ram, dsk] -> return $ RSpec cpu ram dsk + [dsk, ram, cpu] -> return $ RSpec cpu ram dsk _ -> Bad $ "Invalid specification: " ++ inp return $ opts { optTieredSpec = Just tspec } ) "TSPEC") - "enable tiered specs allocation, where we decrease the instance\ - \ spec on failure to allocate and restart the allocation process" + "enable tiered specs allocation, given as 'disk,ram,cpu'" oShowVer :: OptType oShowVer = Option "V" ["version"] diff --git a/Ganeti/HTools/Simu.hs b/Ganeti/HTools/Simu.hs index 07656b4646ec11b00d76d4c79a5423215c016fe2..ee0e66a9d9376802cb2dccec2e0a481d6668e0c4 100644 --- a/Ganeti/HTools/Simu.hs +++ b/Ganeti/HTools/Simu.hs @@ -42,7 +42,7 @@ import qualified Ganeti.HTools.Instance as Instance parseDesc :: String -> Result (Int, Int, Int, Int) parseDesc desc = case sepSplit ',' desc of - n:d:m:c:[] -> do + [n, d, m, c] -> do ncount <- tryRead "node count" n disk <- tryRead "disk size" d mem <- tryRead "memory size" m