From dafc730228cf30cc9dd20ff6eded6294c5f9e162 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 24 Nov 2008 09:44:29 +0000
Subject: [PATCH] Convert iallocator to the new _ComputeDiskSize
_ComputeDiskSize's API was changed for multidisk support in r2010, but
iallocator's call to it were not fixed. Converting them now.
Reviewed-by: iustinp
---
lib/cmdlib.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 85666f352..81d8d7e73 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5479,8 +5479,7 @@ class IAllocator(object):
if len(self.disks) != 2:
raise errors.OpExecError("Only two-disk configurations supported")
- disk_space = _ComputeDiskSize(self.disk_template,
- self.disks[0]["size"], self.disks[1]["size"])
+ disk_space = _ComputeDiskSize(self.disk_template, self.disks)
if self.disk_template in constants.DTS_NET_MIRROR:
self.required_nodes = 2
@@ -5523,10 +5522,8 @@ class IAllocator(object):
raise errors.OpPrereqError("Instance has not exactly one secondary node")
self.required_nodes = 1
-
- disk_space = _ComputeDiskSize(instance.disk_template,
- instance.disks[0].size,
- instance.disks[1].size)
+ disk_sizes = [{'size': disk.size} for disk in instance.disks]
+ disk_space = _ComputeDiskSize(instance.disk_template, disk_sizes)
request = {
"type": "relocate",
--
GitLab