allow kvm recipe to create additionnal disk in a mounted data folder

slapos/recipe/kvm/template/kvm_run.in

@@ -32,6 +32,15 @@ tap_mac_address = '%(tap-mac-address)s'
 smp_count = '%(smp-count)s'
 ram_size = '%(ram-size)s'
 pid_file_path = '%(pid-file-path)s'
+external_disk_number = %(external-disk-number)s
+external_disk_size = '%(external-disk-size)s'
+disk_storage_dict = {}
+disk_storage_list = """%(disk-storage-list)s""".split('\n')
+for storage in disk_storage_list:
+  if storage:
+    key, val = storage.split(' ')
+    disk_storage_dict[key.strip()] = val.strip()
+map_storage_list = ['data%%r' %% (i + 1) for i in range(0, len(disk_storage_dict))]
 
 def md5Checksum(file_path):
     with open(file_path, 'rb') as fh:
@@ -98,6 +107,25 @@ if not os.path.exists(disk_path):
       disk_path, '%%sG' %% disk_size])
   print('Done.')
 
+# Check and create external disk
+additional_disk_list = []
+if disk_storage_dict:
+  if int(external_disk_number) > 0:
+    index = 0
+    while (index < len(disk_storage_dict)) and (index < external_disk_number):
+      path = disk_storage_dict[map_storage_list[index]]
+      if os.path.exists(path):
+        disk_filepath = os.path.join(path, 'kvm_virtual_disk.qcow2')
+        if not os.path.exists(disk_filepath):
+          print('Creating one additional virtual hard drive...')
+          subprocess.Popen([qemu_img_path, 'create' ,'-f', 'qcow2',
+              disk_filepath, '%%sG' %% external_disk_size])
+        additional_disk_list.append(disk_filepath)
+      else:
+        print('Data folder %%s was not used to create external disk %%r' %% (index +1))
+      index += 1
+
+
 # Generate network parameters
 # XXX: use_tap should be a boolean
 tap_network_parameter = []
@@ -130,6 +158,9 @@ if tap_network_parameter == [] and nat_network_parameter == []:
 else:
   kvm_argument_list += nat_network_parameter + tap_network_parameter
 
+for disk in additional_disk_list:
+  kvm_argument_list.extend([
+            '-drive', 'file=%%s,if=%%s' %% (disk, disk_type)])
 # Try to connect to NBD server (and second nbd if defined).
 # If not available, don't even specify it in qemu command line parameters.
 # Reason: if qemu starts with unavailable NBD drive, it will just crash.

software/kvm/common.cfg

@@ -85,7 +85,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 5fdeb07b7baaf0dfa9219f0d6ba1b140
+md5sum = d2413a9d4978092e939418748585bbb3
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -93,7 +93,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 1f21759827c136a65baf597952c71e9a
+md5sum = 10af5beb60655add4de26f7ae60e32aa
 download-only = true
 on-update = true
 
@@ -101,7 +101,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 0d51e71a7967ead2f88e11cc797037a4
+md5sum = 214c46a9aa7605951b8a1f98572dac28
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -47,6 +47,8 @@ config-use-tap = {{ dumps(kvm_parameter_dict.get('use-tap', False)) }}
 config-virtual-hard-drive-url = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
 config-virtual-hard-drive-md5sum = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
 config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-gzipped', False)) }}
+config-external-disk-number = {{ dumps(kvm_parameter_dict.get('external-disk-number', 0)) }}
+config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size', 20)) }}
 return = 
   backend-url
   url
@@ -110,6 +112,8 @@ recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}
+{% set disk_number = len(storage_dict) -%}
+1_info = It is possible to mount up to {{ disk_number }} external disk to your virtual machine. See parameter 'external-disk-number'
 
 [buildout]
 parts = publish

software/kvm/instance-kvm.cfg.jinja2

@@ -103,6 +103,12 @@ qemu-path =  {{ qemu_executable_location }}
 qemu-img-path = {{ qemu_img_executable_location }}
 6tunnel-path = {{ sixtunnel_executable_location }}
 
+disk-storage-list = 
+{% for key, path in storage_dict.items() -%}
+{{ '  ' ~ key ~ ' ' ~ path }}
+{% endfor -%}
+external-disk-number = ${slap-parameter:external-disk-number}
+external-disk-size = ${slap-parameter:external-disk-size}
 
 [kvm-vnc-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -244,8 +250,8 @@ nat-rule-url-{{port}} = [${slap-network-information:global-ipv6}]:{{external_por
 {%     endif -%}
 {%   endfor -%}
 {% endif -%}
-{% if slapparameter_dict.get('use-tap', 'False') == 'True' -%}
-1_info = If IPv4 address is provided for your VM, use this sample configuration to configure your VM interface.
+{% if slapparameter_dict.get('use-tap', 'False') == 'True' and tap_network_dict.has_key('ipv4') -%}
+1_info = Use these configurations below to configure interface {{ iface }} in your VM.
 2_info = ifconfig {{ iface }} ${slap-network-information:tap-ipv4} netmask ${slap-network-information:tap-netmask}
 3_info = route add -host ${slap-network-information:tap-gateway} dev {{ iface }}
 4_info = route add -net ${slap-network-information:tap-network} netmask ${slap-network-information:tap-netmask} gw ${slap-network-information:tap-gateway}
@@ -276,3 +282,6 @@ use-tap = False
 virtual-hard-drive-url =
 virtual-hard-drive-md5sum =
 virtual-hard-drive-gzipped = False
+
+external-disk-number = 0
+external-disk-size = 20

software/kvm/instance.cfg.in

@@ -23,6 +23,10 @@ test = $${dynamic-template-kvm-resilient-test:rendered}
 frozen = ${instance-frozen:output}
 pull-backup = ${template-pull-backup:output}
 
+# XXX - If this configuration is not generated by slapgrid, use empty values
+[storage-configuration]
+storage-home = 
+
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
@@ -30,6 +34,7 @@ partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
+storage-home = $${storage-configuration:storage-home}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -42,6 +47,8 @@ context =
     key eggs_directory buildout:eggs-directory
     key ipv4 slap-configuration:ipv4
     key ipv6 slap-configuration:ipv6
+    key tap_network_dict slap-configuration:tap-network-information-dict
+    key storage_dict slap-configuration:storage-dict
     key slapparameter_dict slap-configuration:configuration
     key computer_id slap-configuration:computer
     $${:extra-context}
@@ -64,6 +71,8 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
     key slapparameter_dict slap-configuration:configuration
+    key storage_dict slap-configuration:storage-dict
+    key tap_network_dict slap-configuration:tap-network-information-dict
     raw curl_executable_location ${curl:location}/bin/curl
     raw dash_executable_location ${dash:location}/bin/dash
     raw dcron_executable_location ${dcron:location}/sbin/crond