From bbe0f2643095766bcc3bc136022d05ccbbaf9524 Mon Sep 17 00:00:00 2001 From: Thomas Thrainer Date: Tue, 13 Aug 2013 11:54:52 +0200 Subject: [PATCH] Fix IPolicy violation check in LUGroupSetParams cfg.GetMultiInstanceInfoByName returns a list of tuples, not a list of instance objects which is required by ComputeNewInstanceViolations. This patch fixes this type error. Signed-off-by: Thomas Thrainer Reviewed-by: Guido Trotter --- lib/cmdlib/group.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/cmdlib/group.py b/lib/cmdlib/group.py index 9d328b5..98a3891 100644 --- a/lib/cmdlib/group.py +++ b/lib/cmdlib/group.py @@ -453,12 +453,14 @@ class LUGroupSetParams(LogicalUnit): new_ipolicy = cluster.SimpleFillIPolicy(self.new_ipolicy) CheckIpolicyVsDiskTemplates(new_ipolicy, cluster.enabled_disk_templates) - instances = self.cfg.GetMultiInstanceInfoByName(owned_instance_names) + instances = \ + dict(self.cfg.GetMultiInstanceInfoByName(owned_instance_names)) gmi = ganeti.masterd.instance violations = \ ComputeNewInstanceViolations(gmi.CalculateGroupIPolicy(cluster, self.group), - new_ipolicy, instances, self.cfg) + new_ipolicy, instances.values(), + self.cfg) if violations: self.LogWarning("After the ipolicy change the following instances" -- 1.7.10.4