Rename Ganeti/HTools/Utils.hs to Ganeti/Utils.hs

[ganeti-local] / htools / Ganeti / HTools / Program / Hspace.hs

diff --git a/htools/Ganeti/HTools/Program/Hspace.hs b/htools/Ganeti/HTools/Program/Hspace.hs
index 2c20ab1..605b4ff 100644 (file)
--- a/htools/Ganeti/HTools/Program/Hspace.hs
+++ b/htools/Ganeti/HTools/Program/Hspace.hs
@@ -40,11 +40,11 @@ import qualified Ganeti.HTools.Cluster as Cluster
 import qualified Ganeti.HTools.Node as Node
 import qualified Ganeti.HTools.Instance as Instance
 
-import Ganeti.HTools.Utils
 import Ganeti.HTools.Types
 import Ganeti.HTools.CLI
 import Ganeti.HTools.ExtLoader
 import Ganeti.HTools.Loader
+import Ganeti.Utils
 
 -- | Options list and functions.
 options :: [OptType]
@@ -67,8 +67,6 @@ options =
   , oStdSpec
   , oTieredSpec
   , oSaveCluster
-  , oShowVer
-  , oShowHelp
   ]
 
 -- | The allocation phase we're in (initial, after tiered allocs, or
@@ -372,9 +370,9 @@ runAllocation cdata stop_allocation actual_result spec dt mode opts = do
 
 -- | Create an instance from a given spec.
 instFromSpec :: RSpec -> DiskTemplate -> Int -> Instance.Instance
-instFromSpec spx disk_template su =
+instFromSpec spx =
   Instance.create "new" (rspecMem spx) (rspecDsk spx)
-    (rspecCpu spx) Running [] True (-1) (-1) disk_template su
+    (rspecCpu spx) Running [] True (-1) (-1)
 
 -- | Main function.
 main :: Options -> [String] -> IO ()