InstanceStartup: use overridden beparams in prereq
authorGuido Trotter <ultrotter@google.com>
Mon, 12 Dec 2011 15:45:32 +0000 (15:45 +0000)
committerGuido Trotter <ultrotter@google.com>
Mon, 9 Jan 2012 17:27:43 +0000 (17:27 +0000)
Without doing this memory checks happen on instance default parameters
rather than any overridden ones.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

lib/cmdlib.py

index 30a3e12..a65fc01 100644 (file)
@@ -6532,6 +6532,7 @@ class LUInstanceStartup(LogicalUnit):
       _CheckNodeOnline(self, instance.primary_node)
 
       bep = self.cfg.GetClusterInfo().FillBE(instance)
+      bep.update(self.op.beparams)
 
       # check bridges existence
       _CheckInstanceBridgesExist(self, instance)