Revision 410a8a76

b/htools/Ganeti/HTools/CLI.hs
115 115
  , optExecJobs    :: Bool           -- ^ Execute the commands via Luxi
116 116
  , optGroup       :: Maybe GroupID  -- ^ The UUID of the group to process
117 117
  , optSelInst     :: [String]       -- ^ Instances to be excluded
118
  , optISpec       :: RSpec          -- ^ Requested instance specs
119 118
  , optLuxi        :: Maybe FilePath -- ^ Collect data from Luxi
120 119
  , optMachineReadable :: Bool       -- ^ Output machine-readable format
121 120
  , optMaster      :: String         -- ^ Collect data from RAPI
......
135 134
  , optShowInsts   :: Bool           -- ^ Whether to show the instance map
136 135
  , optShowNodes   :: Maybe [String] -- ^ Whether to show node status
137 136
  , optShowVer     :: Bool           -- ^ Just show the program version
137
  , optStdSpec     :: RSpec          -- ^ Requested standard specs
138 138
  , optTieredSpec  :: Maybe RSpec    -- ^ Requested specs for tiered mode
139 139
  , optReplay      :: Maybe String   -- ^ Unittests: RNG state
140 140
  , optVerbose     :: Int            -- ^ Verbosity level
......
154 154
  , optExecJobs    = False
155 155
  , optGroup       = Nothing
156 156
  , optSelInst     = []
157
  , optISpec       = RSpec 1 4096 102400
158 157
  , optLuxi        = Nothing
159 158
  , optMachineReadable = False
160 159
  , optMaster      = ""
......
174 173
  , optShowInsts   = False
175 174
  , optShowNodes   = Nothing
176 175
  , optShowVer     = False
176
  , optStdSpec     = RSpec 1 4096 102400
177 177
  , optTieredSpec  = Nothing
178 178
  , optReplay      = Nothing
179 179
  , optVerbose     = 1
......
383 383
oStdSpec = Option "" ["standard-alloc"]
384 384
             (ReqArg (\ inp opts -> do
385 385
                        tspec <- parseISpecString "standard" inp
386
                        return $ opts { optISpec = tspec } )
386
                        return $ opts { optStdSpec = tspec } )
387 387
              "STDSPEC")
388 388
             "enable standard specs allocation, given as 'disk,ram,cpu'"
389 389

  
b/htools/Ganeti/HTools/Program/Hspace.hs
392 392
         exitWith $ ExitFailure 1
393 393

  
394 394
  let verbose = optVerbose opts
395
      ispec = optISpec opts
395
      ispec = optStdSpec opts
396 396
      disk_template = optDiskTemplate opts
397 397
      req_nodes = Instance.requiredNodes disk_template
398 398
      machine_r = optMachineReadable opts

Also available in: Unified diff