On Wed, Apr 15, 2015 at 05:29:53PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
...instead of assuming knowledge about all disk templates
in this part of the code.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/GlobalN1.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Ganeti/HTools/GlobalN1.hs b/src/Ganeti/HTools/GlobalN1.hs
index d60479c..3e8135e 100644
--- a/src/Ganeti/HTools/GlobalN1.hs
+++ b/src/Ganeti/HTools/GlobalN1.hs
@@ -48,7 +48,7 @@ import qualified Ganeti.HTools.Container as Container
import qualified Ganeti.HTools.Instance as Instance
import qualified Ganeti.HTools.Node as Node
import Ganeti.HTools.Types ( IMove(Failover), Ndx, Gdx, Idx, opToResult)
-import Ganeti.Types ( DiskTemplate(DTDrbd8, DTPlain, DTFile)
+import Ganeti.Types ( DiskTemplate(DTDrbd8), diskTemplateMovable
, EvacMode(ChangePrimary))
-- | Foldable function describing how a non-DRBD instance
@@ -71,7 +71,7 @@ canEvacuateNode (nl, il) n = isOk $ do
. Instance.diskTemplate
. flip Container.find il)
$ Node.pList n
- sharedIdxs = filter (not . (`elem` [DTPlain, DTFile])
+ sharedIdxs = filter (diskTemplateMovable
. Instance.diskTemplate
. flip Container.find il) otherIdxs
-- failover all DRBD instances with primaries on n
--
2.2.0.rc0.207.ga3a616c
LGTM, thanks
