Revision 9eeb0aa5 htools/Ganeti/HTools/CLI.hs

b/htools/Ganeti/HTools/CLI.hs
36 36
  , parseYesNo
37 37
  , parseISpecString
38 38
  , shTemplate
39
  , defaultLuxiSocket
40 39
  , maybePrintNodes
41 40
  , maybePrintInsts
42 41
  , maybeShowWarnings
......
92 91

  
93 92
import qualified Ganeti.HTools.Container as Container
94 93
import qualified Ganeti.HTools.Node as Node
95
import qualified Ganeti.Constants as C
94
import qualified Ganeti.Path as Path
96 95
import Ganeti.HTools.Types
97 96
import Ganeti.HTools.Utils
98 97
import Ganeti.BasicTypes
99 98
import Ganeti.Common as Common
100 99

  
101
-- * Constants
102

  
103
-- | The default value for the luxi socket.
104
--
105
-- This is re-exported from the "Ganeti.Constants" module.
106
defaultLuxiSocket :: FilePath
107
defaultLuxiSocket = C.masterSocket
108

  
109 100
-- * Data types
110 101

  
111 102
-- | Command line options structure.
......
301 292
oLuxiSocket :: OptType
302 293
oLuxiSocket = Option "L" ["luxi"]
303 294
              (OptArg ((\ f opts -> Ok opts { optLuxi = Just f }) .
304
                       fromMaybe defaultLuxiSocket) "SOCKET")
295
                       fromMaybe Path.defaultLuxiSocket) "SOCKET")
305 296
              "collect data via Luxi, optionally using the given SOCKET path"
306 297

  
307 298
oMachineReadable :: OptType

Also available in: Unified diff