diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs index a3d27c24d759e4725281f7db274ab7bd39da2ca2..adb6634f5dc82ee36cb789c2fbe1d5b10ea345e5 100644 --- a/Ganeti/HTools/Cluster.hs +++ b/Ganeti/HTools/Cluster.hs @@ -117,7 +117,7 @@ computeBadItems nl il = (bad_nodes, bad_instances) -- | Compute the total free disk and memory in the cluster. -totalResources :: Container.Container Node.Node -> (Int, Int) +totalResources :: Node.List -> (Int, Int) totalResources nl = foldl' (\ (mem, dsk) node -> (mem + (Node.f_mem node), diff --git a/Ganeti/HTools/Utils.hs b/Ganeti/HTools/Utils.hs index 459dc92bcb44e49646d66eca3fcf9c728313fb47..16e3768bb3d853c36f354573e18a80c511f921aa 100644 --- a/Ganeti/HTools/Utils.hs +++ b/Ganeti/HTools/Utils.hs @@ -5,7 +5,6 @@ module Ganeti.HTools.Utils debug , sepSplit , varianceCoeff - , readData , commaJoin , readEitherString , loadJSArray @@ -73,15 +72,6 @@ stdDev lst = varianceCoeff :: Floating a => [a] -> a varianceCoeff lst = (stdDev lst) / (fromIntegral $ length lst) --- | Get an Ok result or print the error and exit. -readData :: Result a -> IO a -readData nd = - (case nd of - Bad x -> do - putStrLn x - exitWith $ ExitFailure 1 - Ok x -> return x) - -- * JSON-related functions -- | Converts a JSON Result into a monadic value.