From 6dc364f99a08c8d81555934cbf506a6c62932183 Mon Sep 17 00:00:00 2001 From: "Jose A. Lopes" Date: Wed, 25 Sep 2013 13:10:08 +0200 Subject: [PATCH] Remove duplicate 'IALLOCATOR_NEVAC_*' constants Constants 'IALLOCATOR_NEVAC_*' are duplicates of 'NODE_EVAC_*' and are no longer being used so they can be removed. Fixes issue 583. Signed-off-by: Jose A. Lopes Reviewed-by: Klaus Aehlig --- lib/constants.py | 5 ----- src/Ganeti/HsConstants.hs | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/lib/constants.py b/lib/constants.py index d15e44e..1ae9c88 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -1552,11 +1552,6 @@ VALID_IALLOCATOR_MODES = _constants.VALID_IALLOCATOR_MODES IALLOCATOR_SEARCH_PATH = _constants.IALLOCATOR_SEARCH_PATH DEFAULT_IALLOCATOR_SHORTCUT = _constants.DEFAULT_IALLOCATOR_SHORTCUT -IALLOCATOR_NEVAC_PRI = _constants.IALLOCATOR_NEVAC_PRI -IALLOCATOR_NEVAC_SEC = _constants.IALLOCATOR_NEVAC_SEC -IALLOCATOR_NEVAC_ALL = _constants.IALLOCATOR_NEVAC_ALL -IALLOCATOR_NEVAC_MODES = _constants.IALLOCATOR_NEVAC_MODES - # Node evacuation NODE_EVAC_PRI = _constants.NODE_EVAC_PRI NODE_EVAC_SEC = _constants.NODE_EVAC_SEC diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs index fd56b27..1a64e2d 100644 --- a/src/Ganeti/HsConstants.hs +++ b/src/Ganeti/HsConstants.hs @@ -1097,19 +1097,6 @@ iallocatorSearchPath = AutoConf.iallocatorSearchPath defaultIallocatorShortcut :: String defaultIallocatorShortcut = "." -iallocatorNevacPri :: String -iallocatorNevacPri = Types.nodeEvacModeToRaw NEvacPrimary - -iallocatorNevacSec :: String -iallocatorNevacSec = Types.nodeEvacModeToRaw NEvacSecondary - -iallocatorNevacAll :: String -iallocatorNevacAll = Types.nodeEvacModeToRaw NEvacAll - -iallocatorNevacModes :: FrozenSet String -iallocatorNevacModes = - ConstantUtils.mkSet $ map Types.nodeEvacModeToRaw [minBound..] - -- * Node evacuation nodeEvacPri :: String -- 1.7.10.4