Add kvm+ software_type

software/kvm/instance-kvm+.cfg

+#############################
+#
+# Instanciate kvm+
+#
+#############################
+[buildout]
+extends = instance-kvm.cfg
+
+[kvm-instance]
+recipe = slapos.cookbook:kvm
+vnc-ip = $${slap-network-information:local-ipv4}
+vnc-port = 5901
+nbd-ip = $${slap-parameter:nbd_ip}
+nbd-port = $${slap-parameter:nbd_port}
+tap = $${slap-network-information:network-interface}
+disk-path = $${rootdirectory:srv}/virtual.qcow2
+disk-size = 20
+socket-path = $${rootdirectory:var}/qmp_socket
+pid-path = $${basedirectory:run}/pid_file
+smp-count = 2
+ram-size = 2048
+mac-address = $${create-mac:mac-address}
+runner-path = $${basedirectory:services}/kvm
+controller-path = $${basedirectory:services}/kvm_controller
+shell-path = ${dash:location}/bin/dash
+qemu-path = ${kvm:location}/bin/qemu-system-x86_64
+qemu-img-path = ${kvm:location}/bin/qemu-img

software/kvm/instance.cfg

@@ -10,6 +10,7 @@ offline = true
 recipe = slapos.cookbook:softwaretype
 default = ${template-kvm:output}
 kvm = ${template-kvm:output}
+kvm+ = ${template-kvm+:output}
 nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
 

software/kvm/software.cfg

@@ -174,6 +174,13 @@ md5sum = ce62abe1edabc78a4baa574a39d7faa0
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
+[template-kvm+]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-kvm+.cfg
+md5sum = 2e35c5b2ac9ee51d8f98fb1199f011c4
+output = ${buildout:directory}/template-kvm+.cfg
+mode = 0644
+
 [template-nbd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nbd.cfg
@@ -191,7 +198,7 @@ mode = 0644
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 0a98e34aaec7097a84066c0665e3a49a
+md5sum = 92865037758ec538aec5f548b4b84835
 output = ${buildout:directory}/template.cfg
 mode = 0644