Merge branch 'general_fixes' into 'master'

Fix for issues preventing cluster bootstrap

See merge request !145

input/grid5000/disks.yaml

@@ -65,3 +65,5 @@ disk_vendor_model_mapping:
   Micron:
     - MTFDDAK480TDN
     - MTFDDAK960TDN
+  Unknown:
+    - unknown

lib/refrepo/input_loader.rb

@@ -183,6 +183,7 @@ end
 def add_kavlan_ipv6s(h)
   h['sites'].each_pair do |site_uid, hs|
     hs['clusters'].each_pair do |_cluster_uid, hc|
+      next if !hc['kavlan'] # skip clusters where kavlan is globally set to false (used for initial cluster installation)
       hc['nodes'].each_pair do |node_uid, hn|
         kvl_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and (v['kavlan'] or not v.has_key?('kavlan')) and v['interface'] == 'Ethernet' }
         if kvl_adapters.length > 0
@@ -222,6 +223,9 @@ def add_software(h)
   h['sites'].each_pair do |site_uid, hs|
     hs['clusters'].each_pair do |cluster_uid, hc|
       hc['nodes'].each_pair do |node_uid, hn|
+        if not hn.key?('software')
+          hn['software'] = {}
+        end
         hn['software']['postinstall-version'] = h['software']['postinstall-version']
         hn['software']['forced-deployment-timestamp'] = h['software']['forced-deployment-timestamp']
       end

lib/refrepo/valid/input/schemas/schema-node.yaml

@@ -23,11 +23,13 @@ chassis:
 exotic: optional_boolean
 gpu_devices: optional_hash
 kavlan:
-  <multi>:
-    <multi>: ip_address
+  <optional_hash>:
+    <multi>:
+      <multi>: ip_address
 kavlan6:
-  <multi>:
-    <multi>: ip_address
+  <optional_hash>:
+    <multi>:
+      <multi>: ip_address
 main_memory:
   ram_size: integer
   pmem_size: optional_integer