Revision 29a30533 htools/Ganeti/HTools/CLI.hs

b/htools/Ganeti/HTools/CLI.hs
55 55
  , oGroup
56 56
  , oIAllocSrc
57 57
  , oInstMoves
58
  , genOLuxiSocket
58 59
  , oLuxiSocket
59 60
  , oMachineReadable
60 61
  , oMaxCpu
......
325 326
   "Specify an iallocator spec as the cluster data source",
326 327
   OptComplFile)
327 328

  
328
oLuxiSocket :: OptType
329
oLuxiSocket =
329
genOLuxiSocket :: String -> OptType
330
genOLuxiSocket defSocket =
330 331
  (Option "L" ["luxi"]
331 332
   (OptArg ((\ f opts -> Ok opts { optLuxi = Just f }) .
332
            fromMaybe Path.defaultLuxiSocket) "SOCKET")
333
   "collect data via Luxi, optionally using the given SOCKET path",
333
            fromMaybe defSocket) "SOCKET")
334
   ("collect data via Luxi, optionally using the given SOCKET path [" ++
335
    defSocket ++ "]"),
334 336
   OptComplFile)
335 337

  
338
oLuxiSocket :: IO OptType
339
oLuxiSocket = Path.defaultLuxiSocket >>= (return . genOLuxiSocket)
340

  
336 341
oMachineReadable :: OptType
337 342
oMachineReadable =
338 343
  (Option "" ["machine-readable"]

Also available in: Unified diff