Revision fa8d6aa7

b/lib/constants.py
300 300

  
301 301
DTS_DRBD = _constants.DTS_DRBD
302 302

  
303
DTS_LVM = _constants.DTS_LVM
304

  
303 305
DRBD_HMAC_ALG = _constants.DRBD_HMAC_ALG
304 306
DRBD_DEFAULT_NET_PROTOCOL = _constants.DRBD_DEFAULT_NET_PROTOCOL
305 307
DRBD_MIGRATION_NET_PROTOCOL = _constants.DRBD_MIGRATION_NET_PROTOCOL
......
311 313
DRBD_B_DISK_DRAIN = _constants.DRBD_B_DISK_DRAIN
312 314
DRBD_B_DISK_FLUSH = _constants.DRBD_B_DISK_FLUSH
313 315

  
314
# the set of lvm-based disk templates
315
DTS_LVM = DISK_TEMPLATES - DTS_NOT_LVM
316

  
317 316
# Valid barrier combinations: "n" or any non-null subset of "bfd"
318 317
DRBD_VALID_BARRIER_OPT = compat.UniqueFrozenset([
319 318
  frozenset([DRBD_B_NONE]),
b/src/Ganeti/ConstantUtils.hs
30 30

  
31 31
import Data.Char (ord)
32 32
import Data.Set (Set)
33
import qualified Data.Set as Set (fromList, toList, union)
33
import qualified Data.Set as Set (difference, fromList, toList, union)
34 34

  
35 35
import Ganeti.THH (PyValue(..))
36 36
import Ganeti.PyValueInstances ()
......
64 64
union :: Ord a => FrozenSet a -> FrozenSet a -> FrozenSet a
65 65
union x y = FrozenSet (unFrozenSet x `Set.union` unFrozenSet y)
66 66

  
67
difference :: Ord a => FrozenSet a -> FrozenSet a -> FrozenSet a
68
difference x y = FrozenSet (unFrozenSet x `Set.difference` unFrozenSet y)
69

  
67 70
-- | 'Protocol' represents the protocols used by the daemons
68 71
data Protocol = Tcp | Udp
69 72
  deriving (Show)
b/src/Ganeti/HsConstants.hs
868 868
  ConstantUtils.mkSet $
869 869
  map Types.diskTemplateToRaw [DTPlain, DTDrbd8, DTBlock, DTRbd, DTExt]
870 870

  
871
-- | The set of lvm-based disk templates
872
dtsLvm :: FrozenSet String
873
dtsLvm = diskTemplates `ConstantUtils.difference` dtsNotLvm
874

  
871 875
-- * Drbd
872 876

  
873 877
drbdHmacAlg :: String

Also available in: Unified diff