Revision 07e30af5

b/lib/constants.py
1332 1332
  }
1333 1333

  
1334 1334
ISPECS_MINMAX_DEFAULTS = _constants.ISPECS_MINMAX_DEFAULTS
1335

  
1336
IPOLICY_DEFAULTS = {
1337
  ISPECS_MINMAX: [ISPECS_MINMAX_DEFAULTS],
1338
  ISPECS_STD: {
1339
    ISPEC_MEM_SIZE: 128,
1340
    ISPEC_CPU_COUNT: 1,
1341
    ISPEC_DISK_COUNT: 1,
1342
    ISPEC_DISK_SIZE: 1024,
1343
    ISPEC_NIC_COUNT: 1,
1344
    ISPEC_SPINDLE_USE: 1,
1345
    },
1346
  IPOLICY_DTS: list(DISK_TEMPLATES),
1347
  IPOLICY_VCPU_RATIO: 4.0,
1348
  IPOLICY_SPINDLE_RATIO: 32.0,
1349
  }
1335
IPOLICY_DEFAULTS = _constants.IPOLICY_DEFAULTS
1350 1336

  
1351 1337
MASTER_POOL_SIZE_DEFAULT = _constants.MASTER_POOL_SIZE_DEFAULT
1352 1338

  
b/src/Ganeti/ConstantUtils.hs
61 61
mkSet :: Ord a => [a] -> FrozenSet a
62 62
mkSet = FrozenSet . Set.fromList
63 63

  
64
toList :: FrozenSet a -> [a]
65
toList = Set.toList . unFrozenSet
66

  
64 67
union :: Ord a => FrozenSet a -> FrozenSet a -> FrozenSet a
65 68
union x y = FrozenSet (unFrozenSet x `Set.union` unFrozenSet y)
66 69

  
b/src/Ganeti/HsConstants.hs
3539 3539
     (ConstantUtils.ispecNicCount, Types.iSpecNicCount Types.defMaxISpec),
3540 3540
     (ConstantUtils.ispecSpindleUse, Types.iSpecSpindleUse Types.defMaxISpec)])]
3541 3541

  
3542
ipolicyDefaults :: Map String PyValueEx
3543
ipolicyDefaults =
3544
  Map.fromList
3545
  [ (ispecsMinmax,        PyValueEx [ispecsMinmaxDefaults])
3546
  , (ispecsStd,           PyValueEx (Map.fromList
3547
                                     [ (ispecMemSize,    128)
3548
                                     , (ispecCpuCount,   1)
3549
                                     , (ispecDiskCount,  1)
3550
                                     , (ispecDiskSize,   1024)
3551
                                     , (ispecNicCount,   1)
3552
                                     , (ispecSpindleUse, 1)
3553
                                     ] :: Map String Int))
3554
  , (ipolicyDts,          PyValueEx (ConstantUtils.toList diskTemplates))
3555
  , (ipolicyVcpuRatio,    PyValueEx (4.0 :: Double))
3556
  , (ipolicySpindleRatio, PyValueEx (32.0 :: Double))
3557
  ]
3558

  
3542 3559
masterPoolSizeDefault :: Int
3543 3560
masterPoolSizeDefault = 10
3544 3561

  

Also available in: Unified diff