... and pushed. (Sorry for forgetting it in the first place.)
On Tue, Apr 9, 2013 at 4:17 PM, Helga Velroyen <[email protected]> wrote: > LGTM, thanks > > > On Mon, Apr 8, 2013 at 4:35 PM, Klaus Aehlig <[email protected]> wrote: > >> For diskless instances it is still reasonable to sum up the disk usage >> of all the (zero) disks, resulting in the empty sum. This uniformity >> also has the advantage that iallocators (like hail) do not have to do >> any special considerations for diskless instances. >> >> Signed-off-by: Klaus Aehlig <[email protected]> >> --- >> lib/masterd/instance.py | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/lib/masterd/instance.py b/lib/masterd/instance.py >> index d99f4d8..0954011 100644 >> --- a/lib/masterd/instance.py >> +++ b/lib/masterd/instance.py >> @@ -1621,7 +1621,7 @@ def ComputeDiskSize(disk_template, disks): >> """ >> # Required free disk space as a function of disk and swap space >> req_size_dict = { >> - constants.DT_DISKLESS: None, >> + constants.DT_DISKLESS: 0, >> constants.DT_PLAIN: sum(d[constants.IDISK_SIZE] for d in disks), >> # 128 MB are added for drbd metadata for each disk >> constants.DT_DRBD8: >> -- >> 1.8.1.3 >> >> >
