Merge c2607a60 dropped the fix of 4ca31587 instead of following the code move of applyMoveEx. So re-add that patch at the new location of applyMoveEx.
Signed-off-by: Klaus Aehlig <[email protected]> --- src/Ganeti/HTools/Cluster/Moves.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Ganeti/HTools/Cluster/Moves.hs b/src/Ganeti/HTools/Cluster/Moves.hs index bbaf44f..8f18019 100644 --- a/src/Ganeti/HTools/Cluster/Moves.hs +++ b/src/Ganeti/HTools/Cluster/Moves.hs @@ -80,7 +80,8 @@ applyMoveEx force nl inst Failover = new_nl = do -- OpResult Node.checkMigration old_p old_s new_p <- Node.addPriEx (Node.offline old_p || force) int_s inst - new_s <- Node.addSec int_p inst old_sdx + new_s <- Node.addSecExEx (Node.offline old_p) (Node.offline old_p) + int_p inst old_sdx let new_inst = Instance.setBoth inst old_sdx old_pdx return (Container.addTwo old_pdx new_s old_sdx new_p nl, new_inst, old_sdx, old_pdx) -- 2.2.0.rc0.207.ga3a616c
