From c17770c7fd8229f71f2643a4010fe808d244eee3 Mon Sep 17 00:00:00 2001 From: Bernardo Dal Seno <bdalseno@google.com> Date: Thu, 1 Nov 2012 21:45:18 +0100 Subject: [PATCH] Fix previous merge A call to _CalculateGroupIPolicy wasn't refactored during the merge. Signed-off-by: Bernardo Dal Seno <bdalseno@google.com> Reviewed-by: Michael Hanselmann <hansmi@google.com> --- lib/cmdlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index fbc63e137..18c54e321 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -10266,7 +10266,7 @@ class LUInstanceCreate(LogicalUnit): } group_info = self.cfg.GetNodeGroup(pnode.group) - ipolicy = _CalculateGroupIPolicy(cluster, group_info) + ipolicy = ganeti.masterd.instance.CalculateGroupIPolicy(cluster, group_info) res = _ComputeIPolicyInstanceSpecViolation(ipolicy, ispec) if not self.op.ignore_ipolicy and res: raise errors.OpPrereqError(("Instance allocation to group %s violates" -- GitLab