KVM SR: Add internal Debian 7 disk image support.

No need for external NBD by default. No need to wait minutes to boot from installer in VM.

component/qemu-kvm/buildout.cfg

@@ -53,3 +53,14 @@ configure-options =
   --target-list=i386-softmmu
   ${kvm:configure-options}
 
+
+[debian-amd64-netinst.iso]
+# Download the installer of Debian 7 (Wheezy)
+recipe = slapos.recipe.download
+url = http://cdimage.debian.org/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-netinst.iso
+filename = ${:_buildout_section_name_}
+md5sum = 80f498a1f9daa76bc911ae13692e4495
+download-only = true
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+

slapos/recipe/kvm/__init__.py

@@ -61,7 +61,8 @@ class Recipe(GenericBaseRecipe):
       shell_path=self.options['shell-path'],
       qemu_path=self.options['qemu-path'],
       qemu_img_path=self.options['qemu-img-path'],
-      vnc_passwd=self.options['passwd']
+      vnc_passwd=self.options['passwd'],
+      default_disk_image=self.options['default-disk-image'],
     )
 
     # Runners

slapos/recipe/kvm/template/kvm_run.in

@@ -7,6 +7,9 @@ import os
 import socket
 import subprocess
 
+# XXX: give all of this through parameter, don't use this as template
+default_disk_image = '%(default_disk_image)s'
+
 def getSocketStatus(host, port):
   s = None
   for res in socket.getaddrinfo(host, port,
@@ -26,7 +29,8 @@ def getSocketStatus(host, port):
     break
   return s
 
-# create disk if doesn't exist
+# Create disk if doesn't exist
+# XXX: move to Buildout profile
 disk_path = '%(disk_path)s'
 if not os.path.exists(disk_path):
   subprocess.Popen(['%(qemu_img_path)s', 'create' ,'-f', 'qcow2',
@@ -58,4 +62,10 @@ for nbd_ip, nbd_port in (
           '-drive',
           'file=nbd:[%%s]:%%s,media=cdrom' %% (nbd_ip, nbd_port)])
 
+# If no NBD is specified/available: use internal disk image
+else:
+  kvm_argument_list.extend([
+      '-drive', 'file=%%s,media=cdrom' %% default_disk_image
+  ])
+
 os.execv('%(qemu_path)s', kvm_argument_list)

software/kvm/common.cfg

@@ -84,7 +84,7 @@ mode = 0644
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg.in
-md5sum = 1be5b4a467591c82688754c3bd4aa6e5
+md5sum = f7c0e2172dac4ee70daae50f38d610ef
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 

software/kvm/instance-kvm.cfg.in

@@ -51,6 +51,7 @@ bytes = 8
 recipe = slapos.cookbook:kvm
 vnc-ip = $${slap-network-information:local-ipv4}
 vnc-port = 5901
+default-disk-image = ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
 nbd-host = $${slap-parameter:nbd-host}
 nbd-port = $${slap-parameter:nbd-port}
 nbd2-host = $${slap-parameter:nbd2-host}
@@ -204,7 +205,7 @@ frontend-software-type = frontend
 frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
 frontend-instance-guid =
 nbd-port = 1024
-nbd-host = debian.nbd.vifib.net
+nbd-host =
 nbd2-port = 1024
 nbd2-host =