[dev] Fixed bug on input_loader.rb (expand_angle_brackets have to be called...

[dev] Fixed bug on input_loader.rb (expand_angle_brackets have to be called after merging hashes). Updated input/example/.../pomme.yaml

generators/lib/input_loader.rb

@@ -23,13 +23,15 @@ def load_yaml_file_hierarchy(directory)
         next
       end
       
-      # Expand the hash
-      file_hash.expand_angle_brackets()
-      
       # Inject the file content into the global_hash, at the right place
       path_hierarchy = File.dirname(filename).split('/')     # Split the file path (path relative to input/)
       file_hash = Hash.from_array(path_hierarchy, file_hash) # Build the nested hash hierarchy according to the file path
       global_hash = global_hash.deep_merge(file_hash)        # Merge global_hash and file_hash. The value for entries with duplicate keys will be that of file_hash
+
+      # Expand the hash. Done at each iteration for enforcing priorities between duplicate entries:
+      # ie. keys to be expanded have lowest priority on existing entries but higher priority on the entries found in the next files
+      global_hash.expand_angle_brackets()
+
     }
 
   }

input/example/sites/rouen/clusters/pomme/pomme.yml

@@ -7,7 +7,7 @@ type: cluster
 uid: pomme
 
 nodes:
-  pomme-<->:
+  pomme-[-]:
     type: node
     performance:
       core_flops: 3929000000
@@ -20,8 +20,9 @@ nodes:
       deploy: true
       besteffort: true
       virtual: true
-    storage_devices:
-      - interface: SCSI
+    block_devices:
+      sda:
+        interface: SCSI
         driver: mptspi
         storage: HDD
     network_adapters: