KVM: disk image promise: don't fail if only cluster leaks found.

software/kvm/common.cfg

@@ -93,7 +93,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = ac69266206830226185e576fb6e4935a
+md5sum = aae627dc6cfc9c728f61a3f12c525cf7
 download-only = true
 on-update = true
 

software/kvm/instance-kvm.cfg.jinja2

@@ -107,7 +107,16 @@ port = ${kvm-instance:vnc-port}
 # Check that disk image is not corrupted
 recipe = collective.recipe.template
 input = inline:#!/bin/sh
+  # Return code 0 is "OK"
+  # Return code 3 is "found leaks, but image is OK"
+  # http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-img.c;h=4e9a7f5741c9cb863d978225829e68fefcae3947;hb=HEAD#l702
   ${kvm-instance:qemu-img-path} check ${kvm-instance:disk-path}
+  RETURN_CODE=$?
+  if [ $RETURN_CODE -eq 0 ] || [ $RETURN_CODE -eq 3 ]; then
+    exit 0
+  else
+    exit 1
+  fi
 output = ${directory:promises}/kvm-disk-image-corruption
 mode = 700