Allow to give RMA and disk parameters to KVM instance.

software/kvm/README.txt

@@ -7,6 +7,8 @@ Introduction
 This software release is used to deploy KVM instances, NBD instances and
 Frontend instances of KVM.
 
+For extensive parameters definition, please look at parameter-input-schema.json.
+
 Examples
 --------
 

software/kvm/instance-kvm.cfg

@@ -45,15 +45,15 @@ bytes = 4
 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}
+nbd-ip = $${slap-parameter:nbd-ip}
+nbd-port = $${slap-parameter:nbd-port}
 tap = $${slap-network-information:network-interface}
 disk-path = $${directory:srv}/virtual.qcow2
-disk-size = 10
+disk-size = $${slap-parameter:disk-size}
 socket-path = $${directory:var}/qmp_socket
 pid-path = $${directory:run}/pid_file
 smp-count = 1
-ram-size = 1024
+ram-size = $${slap-parameter:ram-size}
 mac-address = $${create-mac:mac-address}
 runner-path = $${directory:services}/kvm
 controller-path = $${directory:scripts}/kvm_controller
@@ -164,5 +164,13 @@ curl_path = ${curl:location}/bin/curl
 frontend-instance-guid = SOFTINST-11031
 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
-nbd_port = 1024
-nbd_ip = debian.nbd.vifib.net
+
+nbd-port = 1024
+nbd-ip = debian.nbd.vifib.net
+
+# backward compatibility: old style (nbd_port) can still be used.
+nbd_port = ${:nbd-port}
+nbd_ip = ${:nbd-ip}
+
+ram-size = 1024
+disk-size = 10

software/kvm/instance-kvmplus.cfg

@@ -3,10 +3,12 @@
 # Instanciate kvm+
 #
 #############################
+
+# Deprecated. Just specify amount of RAM / disk you want in instance parameter.
+
 [buildout]
 extends = ${template-kvm:output}
 
-[kvm-instance]
-disk-size = 20
-smp-count = 2
+[slap-parameter]
 ram-size = 2048
+disk-size = 20
\ No newline at end of file

software/kvm/software.cfg

@@ -119,14 +119,14 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg
-md5sum = 68478e759138a42f09518d01da548b8a
+md5sum = eecb8d7b5bb4d21fd9e9596424ccb421
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
 [template-kvmplus]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvmplus.cfg
-md5sum = 301fbe4eaaab5648e1a933a4c853f5b9
+md5sum = c8e92237eeda93caca1132b5202c3a02
 output = ${buildout:directory}/template-kvmplus.cfg
 mode = 0644