From d05326fce33c86b62dcd1568be13b5c71ea902b1 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 23 Nov 2011 08:15:18 +0100
Subject: [PATCH] Fix error when removing node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ConfigWriter.GetAllInstancesInfo returns a dictionary, not a list.
Removing a node would fail with βtoo many values to unpackβ.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index f5876f26e..0c66405da 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4347,7 +4347,7 @@ class LUNodeRemove(LogicalUnit):
raise errors.OpPrereqError("Node is the master node, failover to another"
" node is required", errors.ECODE_INVAL)
- for instance_name, instance in self.cfg.GetAllInstancesInfo():
+ for instance_name, instance in self.cfg.GetAllInstancesInfo().items():
if node.name in instance.all_nodes:
raise errors.OpPrereqError("Instance %s is still running on the node,"
" please remove first" % instance_name,
--
GitLab