diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index 70f328886831129b767c3be54fe9b3ea6b598c7f..ad821c7f791a7f428eda21f7b562b6de17c0e784 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 2366334d99759bbfa6d947f9bf8ef575c285e91a..a0406fd09ad8e27fcf70407146c67e696615b9fa 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index a4b2aa22cd05856195529e4ecc61eb885f4993ce..b871b3dc29f33d4cd9ffb87c65a5150af88f0225 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 272eebef60e32122452a46d7ec26d5e95104713f..14bb50463b1c009c3ff0d428ebe1499db2fbed47 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index b5f46e85f667a80dd3bea2f9a11bbc1a1bfc8202..2d7bdf734571cf0d7818e31cba18d0d2e7545270 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index 24769141ad37e023e0381690c5ea776fa5151417..358d3662b1b8a1d678ec0dc26aadb0ce8f5687a6 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index b3dd469230fceba6aee1d518b34a231354bb59e1..0f7c931d27bc08d16e1cda57b46070034a38c214 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index a02af8e06720f5e329e9a76cf1f8b57fb9e24c3b..fb6d24dddb0ef824b3e2e9e92dd0d70c4500860d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index c545a5de8f33c953ff4f61f5ab3aa1933cda7eec..a4a49891bbd18ec63abde6fc72ab0b20073b13ec 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index 01a7697cb6d40b4f71e23e1cffe358d7384c14c0..95dea73fe77502a2ffc4ffc4817364c0d5a3d3b9 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 0227d39750c61aaa7a65c444c1c1353e6368ec99..09a082d3bde314eebd65e148517432c83a81c006 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index 0b7381dc0ae029d38dec2fa860d82ecf7be33781..55dd2c85364fbde6b02a135eba64235c9ee42a5c 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 48b11b073fd09834ccaa040bd5a089ec6b9f5025..11b165181515d03832003cd8b10e3622ecf925ee 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 6ad4dc831faf164a07441f447da567618c1da73b..9af9a23fcee806932ff7932f6f60c9a08f32714f 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index 0c03cb461307168869ec6147225aff884e199d48..29ece3d2cd42a27d84e4366fc6fd4cec9f6c8da2 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 8c3a95717b5ab9319232a03ecb43325f1567974c..96b78b7f724aa3b456c89787e6262030c083ce14 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index 045e00a14d45bd5d1c4877fb49c73b635118b591..1523269e04617f6f99218ca65ac12c779ce56bfa 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index 4aea8d40af94f1cdb9a282671af0248f27d8b0f7..bcb28be5f0b727495d3f588d7c4f051cc10b2a33 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "SSD",
+      "storage": "HDD",
       "vendor": "Dell"
     }
   ],
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
index a1cd1ef1b0eb0a73f4c1f4de674c54d99faf8dbd..541dcdd833f04cffe200d1b672fd94526c403c07 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
@@ -42,10 +42,7 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
       sdc:
         interface: SATA
-        storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
index bd76ca5182fabb666aa5423dbf444dc6b383ce90..eeb4aecd81d77b5b659b708b35503b6dc93d6322 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -81,17 +81,20 @@ dahu-1:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfd50"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
index a75c52730e7830f49583422d65dc68e738656d3d..f7ab9946fd6ffb4776e3cd2757cd75f1cd1c8014 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -81,17 +81,20 @@ dahu-10:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b09"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59eee40"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
index a5e9d0d6654f5c7fa29d86200add479e7f099dab..952fb59af416a199956efa5c494fe9fa275ee081 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -81,17 +81,20 @@ dahu-11:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b18"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c5a06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
index c9288158772e1412632d15a3c23e099f7e911dab..60784bd38e9c8300110aabb9b044d5da1317c537 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -81,17 +81,20 @@ dahu-12:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b16"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f5333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
index 3e0173667f37d3689c872edcc9a60d9bfdcf9014..7f9297a180c1764698eef88b95ef8b58d922861d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -81,17 +81,20 @@ dahu-13:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108c2b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bee44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
index 4421302c0f5cabb2533b7ba79ad92ff6d50e017f..125d9803b843aa792b9997cdf6bcde80ee4b3998 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -81,17 +81,20 @@ dahu-14:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b54"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c855e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
index 324d1c200f781fb910d30dcbd98d0c3cab5ee834..989ca5941ddb181a209881c3eaa9f78fdd68ba42 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -81,17 +81,20 @@ dahu-15:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c408c212f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfe44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
index ee6df49b7736ab540919ed79b17a829d9d0604ea..431c5cef87cd62e0520691171e8f52f6980909f6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -81,17 +81,20 @@ dahu-16:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107f0a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be813"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
index 1ea841317a2c45455a16abc4936c28066bf38c7f..f1cab212675c3213a9d59b490ad39eac5eff2c77 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -81,17 +81,20 @@ dahu-17:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f2445"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index f633b1f2123f94384a39a54772aacb8187275b3d..8c9fea867033609cd62d111745a3e2855405d032 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -81,17 +81,20 @@ dahu-18:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aee"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f6e03"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
index c2da2e1f0e9e6927adfc8586ce4455e9de79dbcc..a63c668f06ab2847f4c9c1e00ad43ab12c9dfa69 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -81,17 +81,20 @@ dahu-19:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107adf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59b9b2a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
index 1c7efda4e73df802328b489f1b14c50a79809c61..64b24186df53c2244ba7034158458af1d150febf 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -81,17 +81,20 @@ dahu-2:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bf16d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
index 1920d49693b931f69300f050258f71fda93bc8aa..ae71cfceadbf51f8bb93cd4e9dac0d686984ac1a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -81,17 +81,20 @@ dahu-20:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c6300"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
index 0a92eca2264d1f7d60f5f48af62959c546ddc5a8..c8b4bfbf2126c3ce1a892aec2b200d9b29b76c5b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -81,17 +81,20 @@ dahu-21:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c85a2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
index 9c71db6c6675b0f547aacc1e731cbce323739407..4e04fb786767700431a169e0697a9f8da731368b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -81,17 +81,20 @@ dahu-22:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bdfbc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
index af2ef40a00ac4041e00b39b408b27ea46fca069c..323d97db808eb34ca3433d6e15d3035c4925f46d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -81,17 +81,20 @@ dahu-23:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b05"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be5d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
index dade4e0498fc3ff1ee7fc8b7b7b0f46d28585fb2..25dc1b8c8ec00e96342520febc8dea885d06cd18 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -81,17 +81,20 @@ dahu-24:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ba245"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
index 66fa2e12f0ed56b5af5ea9d8563f668236d4de36..e16227a7cb0c285094a45270adee063f1998f350 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -81,17 +81,20 @@ dahu-25:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a171a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
index 48ee4e132041b5456fb92103ad56aeacbe247cb8..7ae58dabb09de86f71f54008fd90eb23ce328c3b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -81,17 +81,20 @@ dahu-26:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b26"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ed6c7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
index 5c25dbdb04f14e755b4602f365b106f186991e26..33d4d70b00087d5a22dcd59bb0196e994b6b504a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -81,17 +81,20 @@ dahu-27:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b23"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f1bfa"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
index a09311cb840b9f902c6048355c622ee87839ab50..61812afae22b063855fe3e77a33b9a6e7f8066ee 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -81,17 +81,20 @@ dahu-28:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108792"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59baaab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
index e799ade3760051889e81bbb55e5328a0e4f30b72..606b07dcb9448078b97cc7f1149237d807497d95 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -81,17 +81,20 @@ dahu-29:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bb3fc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
index 9ad63b2dfac1cd684e20d6c5f13945a1e5127e18..193151016286026ab7d082bb9bb55b2267983d39 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -81,17 +81,20 @@ dahu-3:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bd027"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
index c1807a361ece03299a5dd12fc2a481e5c5eee389..fa6846f3057d48d968d275e942941e4928d1ac02 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -81,17 +81,20 @@ dahu-30:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a1b937"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
index 127a3f48f36b2ae6c26a04f9c5da4ffb955b28d6..60ce99cd6e388e526c1a6a1f4d9c2b91dbb1867a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -81,17 +81,20 @@ dahu-31:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bdd"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c90ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
index 39aaa4ad329894f2abd72610253bb5dce69c97d2..10fad1b9691da3125d08e2b9d7384a979a2bf4af 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -81,17 +81,20 @@ dahu-32:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bea5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
index 5cf1ec03d5d0c09a1802859da5fcfc8373a23535..eaa435cfcd59fd99fe3c0252d88c7e7fcd2e2767 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -81,17 +81,20 @@ dahu-4:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b07"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c1fa4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
index 39291a58a239d55e22875006927232a43e2da045..a84a7ffe55b4da2205a63a66ce96e5bb113fd378 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -81,17 +81,20 @@ dahu-5:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c0047"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
index feb2c15d9f286a3e4e6b5c4f40bddac2477fceea..b3307c9a7c408634082e658f08099375d387306a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -81,17 +81,20 @@ dahu-6:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfa82"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
index 7f94f5de48613adb3956ff93e21fcf3f50a0ead7..576b5c66e0e809c9819538f71306ae77a3d31e7c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -81,17 +81,20 @@ dahu-7:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ab8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a16fb1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB32
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
index 564b7be880a1f7564cf2f423168e0ce0d496d8bd..e6f9f383d8ba9a9ceeedb6edd5e744e5697a8f09 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -81,17 +81,20 @@ dahu-8:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be557"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
index e6c7bb0fc25d16b60dc8e60ea01b69b7356b8bf4..af76cbe39d90d93162e440ca5b3738a47df3ab96 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -81,17 +81,20 @@ dahu-9:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107cba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c79a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index ec8d28b18b5dd5a88502b6ba92f7049b3486bc53..e70af29156054c6166845f27eb28ead374409063 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -60,7 +60,5 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
       sdb:
         interface: SATA
-        storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
index dd6dbdec861e138d3deb93fc57e69243efe9770c..56c3075850736f9caebfa97480c9f50535fec526 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -161,9 +161,11 @@ drac-1:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c18078e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
index 20013d4ff264e9dab1c7a164e3b11de907c7a79f..87c8e1122b844a9f6e3ee2baffa65d40c4c36abc 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -161,9 +161,11 @@ drac-10:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081027356"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
index a53b18faeefe59de9295563a1b7b7da6ec10bd5c..aa94021cb3bce29e91ca3bcfd610488de5e164f8 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -161,9 +161,11 @@ drac-11:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106cbd"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
index 4b87817c3aa94562fdfd33589cfa4dc5c7574190..eb3cf012826f73dfba67c20ea11ea2d82d7bb1b5 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -161,9 +161,11 @@ drac-12:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106db5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
index 80212ad64428deba8fac3bf945d0c71c891341a5..5175c5cb1c755511a408736603ff3381ca11adc7 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -161,9 +161,11 @@ drac-2:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081107893"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
index 176a6d92e15d26f84bbc219e87f93ffe9df06e6b..45b58fac184f47f8b261c735d617f2bb540871c0 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -161,9 +161,11 @@ drac-3:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5a66ac"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
index f1bc50516431db01ad23d15469cd858c5d0b5fcd..7cb9614c4e9a021fe5ed1ba8cdcf0fadcef98e08 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -161,9 +161,11 @@ drac-4:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081026d3e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
index 81b93b4088664ff563f5fbc0d2183582693588bf..ed6e03a0af16028e4a9b939261a02a5c2f43ff97 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -161,9 +161,11 @@ drac-5:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cb8a9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
index 83e39dcddd5ba1b3b44aefa37a45877ff9d19395..15c876bc15ae7eee8bb3c0f456731aea0496e1e5 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -161,9 +161,11 @@ drac-6:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108685"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
index b4520427455fa0a66e4fd83d3781e1ddec87944a..700c899d194f66f12f1e580ff268dce675df1386 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -161,9 +161,11 @@ drac-7:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008111f2af"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
index ddb87e3aadeb46c07bc00f1a295b4d029dffa269..8bc281b12927f5b15f1564df531d139f2e96abf2 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -161,9 +161,11 @@ drac-8:
       firmware_version: BE32
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110789b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
index 988f6c41662c963f06f4642569ecd285e8fc68f1..efd90a935c4dc68bdf628a01a5e708c10c2dbc97 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -161,9 +161,11 @@ drac-9:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5ab80c"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
index bb7ba5b64d09e5958dbebc63b908fdfb2bd7e084..0040f123d36b62eb56900e8c5a5f90369168afab 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -81,11 +81,13 @@ troll-1:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122febd94"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
index 2861258c154a0a41c1d17b7439b4e6c2cc914691..9d3146a7538ef39d8afc4c57967ad5d8fc2ea320 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -81,11 +81,13 @@ troll-2:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba5f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
index 4cad49b525670c0b2a9ab39cbd4ab574d584941c..14df3fbc9d815a301adafdb0799a48544ac38716 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -81,11 +81,13 @@ troll-3:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122fea331"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
index da0926007f419f57559f67aec124969f191ee24c..85ca4cd654d326a0c91922e6774c71d395dd2834 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -81,11 +81,13 @@ troll-4:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
index 57032f426218cf011d9c8ba6bc5dc4b093acdf2e..da21b602f81b48120ec3c706db05f48aa639a1a4 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
@@ -40,10 +40,8 @@ nodes:
     storage_devices:
       nvme0n1:
         interface: NVME
-        storage: SSD
       sda:
         interface: SATA
-        storage: SSD
     monitoring:
       wattmeter: true
     sensors:
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 471146e2991b5de285b2ad29c4d62790b3daa716..9cb12263fdf467bf931ecacd4e7a49f68b601959 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -98,29 +98,34 @@ yeti-1:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de1d705"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08870d7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0897757"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae94bf"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index 10e97e15207d75b79f0ae80f0fa1f72776abc3e9..eea5565fe57615d015f237b37b19ce3fa97190f4 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -98,29 +98,34 @@ yeti-2:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de16d7a"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08aab8f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a088ce2f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae06af"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index 216550a97a435853d424ac27516c940296483413..d5bdb4ddffa029c3e9aaddd12c9ca0dc51e28ed0 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -98,29 +98,34 @@ yeti-3:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4150a22f9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL65
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a4beb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a089563f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0adf81f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index d979af424f3f4de54813f3aea7994290785d31c8..eb5bf9dca059b266c77c034e45ef4736ad8eb51f 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -98,29 +98,34 @@ yeti-4:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de0fa6e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a9c6b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a7bb3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae58b3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
index 7c0c444ad118b8799ad2906ed7841f76fd93bb2d..d1cdc27a58b755860fe2fef3be97fa00573741bb 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
@@ -48,21 +48,16 @@ nodes:
     storage_devices:
       nvme0n1:
         interface: NVME
-        storage: SSD
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
     monitoring:
       wattmeter: true
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
index a573aafa7d6e9fd4a0d3deaa0503ff1708f5d188..9c4fde9c1c18d4cf894d9b4c8b732dd16bdf20fb 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
@@ -47,7 +47,5 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index 848910c2c2e9eb56236ca8277045dcb414182925..960236876588cd84852e462313a2546c7d39fd43 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -88,11 +88,13 @@ chetemi-1:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c06c7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index 9cf8b520c5a82dd4fd969babac95b72d007710a1..2936d826f2884cfe8fa2a5033478ee198c4b70be 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -88,11 +88,13 @@ chetemi-10:
       firmware_version: KT37
       model: ST600MP0036
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be5d7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index 0c7c411d249482747033ace725ff40259e606479..6280325c10ef5dbf2da551da2f6e42ab3101db8d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -88,11 +88,13 @@ chetemi-11:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c29ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index 8bc809e7ff3e40619ccd65ff3bf3fd8cc261d34e..4e55d5f8d923545763980e2111564ab58a88d259 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -88,11 +88,13 @@ chetemi-12:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be0d3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index e42134981110a4dbd62ec1dc12d86e6c8d715f9c..21a39de591d3a228f57d6cc32115dfe43f652678 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -88,11 +88,13 @@ chetemi-13:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdf6f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index 0dec96bcc010e377239c0c8295e9e692913f6f79..8d201849212b5b8d26582dbb4a0347c503204ac6 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -88,11 +88,13 @@ chetemi-14:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bacaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index 54bbee91b8d295fff201d0e20290c00693c9f97b..3798e76d6bb677d888ab5663f8c97d32d61847c8 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -88,11 +88,13 @@ chetemi-15:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bc92b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index 3e3c11f439e223dc8802a0d2208c5236b63886b5..98736c05252015e88fbc4dc07d1c13e0957ab194 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -88,11 +88,13 @@ chetemi-2:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c11d3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index d8911f201fabafa82e580415ed9edcc9bcc99bea..4f0eb3c2472dce54b1666ed3b2e544c212827173 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -88,11 +88,13 @@ chetemi-3:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2b5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index 0d2bb00496cd11f3f6ac2b11f79fb88cede0351b..93660a9468341ed1417972764189765f1c25a278 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -88,11 +88,13 @@ chetemi-4:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1723"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index 30f5f9df9eaba36d7ee316febf8db8fcfa62d7bc..5f90382016b86d559ad6f1d0bc757582aa55bb4f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -88,11 +88,13 @@ chetemi-5:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdb03"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index 758c20e1d123cdbdcf9ef2c2736230b4388eb557..01be9f7bffef4aa9e7b79dadf195c06b92231248 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -88,11 +88,13 @@ chetemi-6:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bf523"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index 915d1fbd461fb1e2dda0a073e357997a8e89c0ae..104b6e74bb7ec48411f96c63ec7346a2b91d5728 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -88,11 +88,13 @@ chetemi-7:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index d0d778e5cf8eb30e759048393759c207c0dd61af..82cbf921b37fee19276e1fcd5a7baca5e3bf2bad 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -88,11 +88,13 @@ chetemi-8:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c310b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index 29dcb5af45e052a5a755b8ce7b5bbfaf84770f8f..2d59677e433495f6f9738d6254e1bfe6f9b1af9e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -88,11 +88,13 @@ chetemi-9:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1dbf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
index cb0ae87031e253bb947c52f4fd602231271ccf30..32f27bbb2afd549d872bb9b611806e9498958029 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
@@ -55,12 +55,9 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
index 51b9a8e0dedf3e76245e345a3279349f495eab7e..65085e22fb997b080b7f197513299c1fa38ac0f4 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -106,17 +106,20 @@ chiclet-1:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb7f7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64daa5f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
index 133c1495131044d843780da70cacf4034436e5e4..89c58d1533bb03ac73ce567abfd36a87969c0436 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -106,17 +106,20 @@ chiclet-2:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ef6e3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e05d7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
index 150656e2606333c8f14388c0d3d10aadc7bb0e91..39335aa29712e08d952f79835d042263f2ab721c 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -106,17 +106,20 @@ chiclet-3:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d96f3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e26af"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
index ad337ef923a1effb56e927f7d62246231975701c..3fe306ea93b9b36e378c8447481924249b459d0b 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -106,17 +106,20 @@ chiclet-4:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec373"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d90c7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
index ff3552c09dcd66424844a41d5d7bd6dd37f9e494..969777ba34777b9386b86a7797e17c87f7e55ada 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -106,17 +106,20 @@ chiclet-5:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64dc72f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df1eb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
index dcadab31b4caa67dcc9adbde49d2fc3b14e0fbe8..4019f34388e83149a3a4fa39bdf375e282f52ce1 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -106,17 +106,20 @@ chiclet-6:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6cd3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64db00b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
index 3ee0f8d65a5f452ab0e4d6e4658bc336c5c47788..189b114e8a957da47883e6cd4d729fcd377304a1 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -106,17 +106,20 @@ chiclet-7:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e09fb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d279b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
index 9c64bed57bdb109554868ca3d611e651c0a48eb4..e773cec2d79be049f42947da477c121d84a11862 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -106,17 +106,20 @@ chiclet-8:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e0c83"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec817"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
index e1bcb11ee5d09981ac56b77939be64ed712568d8..3afd2c428645dfe8bc834b1e9da2d966ffbab4f9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
@@ -47,16 +47,12 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SAS
-        storage: SSD
         reservation: true
       sdc:
         interface: SATA
-        storage: HDD
         reservation: true
       sdd:
         interface: SATA
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index 8f0c690382b3adec101ec61fb3ee826f3cc801ed..10a6fabc4200d1bc1bbea6325a089937245ad1db 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -105,23 +105,27 @@ chifflet-1:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68a5"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973b80345a"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index 312572a1608afc8dcaa7b8f91b5094315da6ff01..4dd48cb213f18da7947dd3e9ec6059321a613fcf 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -105,23 +105,27 @@ chifflet-2:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ad9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828eb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index cc10b6141cad9bfd78ea862ed8ef955bc0030e47..80dec0e34afbb7866a8b25f4b1910583d3d8bfa2 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -105,23 +105,27 @@ chifflet-3:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a99"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b54"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index cfbed1842e9fe8c0d4169737cc6985cc257b2e93..b701e047db2675c692ca07036c94bec8663abb2e 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -105,23 +105,27 @@ chifflet-4:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f2"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e6"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index 28095f81b47315edd358bae43c18ae17ec2e5928..7c1f251ba215aee10162a63819c9390a77f36516 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -105,23 +105,27 @@ chifflet-5:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a81"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ea"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ee"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index c8098c59fd97efe94905521faf1f6e03abc3171d..0e2c7721f4a9c22a7984c5d92de5ceade9cad53a 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -105,23 +105,27 @@ chifflet-6:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac5"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b56"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b58"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index 4f935ba7be5c9eaa5343f636e2493cc5335c0684..dade29c1c2976e7b92af8fa89ab881faf28abafd 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -105,23 +105,27 @@ chifflet-7:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a85"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index 931fcc2bfc36075e00b59a1d3cdaa7f38e5422e3..8f90c7b71350058736f50bab4e30f35d638e3321 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -105,23 +105,27 @@ chifflet-8:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a91"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e8"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
index e64003ac1346fd3a3e3c8f2b33d42389f66836e1..d0da4260491d250b2bdee750156d09f1fbe74df2 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
@@ -55,24 +55,18 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
index 62662529364afeedff8a3e090ad1a9593d123623..705157eb42501178b3cd456eb3b33564e287e44c 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -123,35 +123,41 @@ chifflot-1:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5341"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e236f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9e47"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e447b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df333"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
index 7022133207aa16a36336c8be5023b997899c1220..e3753660277bf1abb42765f06e9ed6c3d2e9eba6 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -123,35 +123,41 @@ chifflot-2:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5361"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec36b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64db51f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb823"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ebc97"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
index 81cafabdd64532de9f3784e851475ab63a0eb71c..27ac7860b76c46ceb12ddd83553cf41676b6899f 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -123,35 +123,41 @@ chifflot-3:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b530e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213ef9"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213e0d"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213b61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000398c820eb65"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
index 61598a8e17c8977b1e08efdf5a0327b1fa20c7cd..983184babee9b78da2690ba4103e372d4b94d147 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -123,35 +123,41 @@ chifflot-4:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e1"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eabab"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eac67"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6557"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e4f0b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
index 919ccc1319a65b8aed26a6588a7f647d7ea88b9f..29f1129886d0c18ced00213b43e4b7ca7cba725c 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -123,35 +123,41 @@ chifflot-5:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52aa"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d3fc7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eddeb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9a9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64de323"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
index 62a521fe8e584421e1c766fb5fdd0e3eb8dcfe96..6c0ecf30800eee56fb7fa5874923ec3372fffe8a 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -123,35 +123,41 @@ chifflot-6:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e64bb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e195b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ecc33"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e087f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
index 5ce217918370f471a06e781925d208fc16e5bbc5..3eec0da4d89818636c2c2b21aa951663c656ed16 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -123,35 +123,41 @@ chifflot-7:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d34"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792f38"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000cca2697930a8"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792dd0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792fb0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
index e8c263d3ad93a95f86b7cc65a4c09b44d5c06ce3..bc34f8e595b12f25d1855da6662c0af1afb34c2b 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -123,35 +123,41 @@ chifflot-8:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b3de6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269788468"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000cca26979314c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792d1c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792e7c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index ec15bcf48b17aff094899143fa309ffd60b89d4c..503de4400026074adf66426a83386773e6e319d3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -70,5 +70,6 @@ petitprince-1:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index fc47792561e94ab1b97348568cd7003c618157b5..d36e8bf22664ebac8e8c0404583a37a1c9532e92 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -70,5 +70,6 @@ petitprince-10:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index b306db6d34a48ec1e0f8b0bf547e5f276b5585bf..ce962061793594053224180579e871b5a13ddb13 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -70,5 +70,6 @@ petitprince-11:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index d56ba57201d4c8bfef6201827d12e8b82f26bdb2..98988753c9e7ac11a456e5424c1ef816d1619d32 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -70,5 +70,6 @@ petitprince-13:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 6209c9ab8122a1d865653bbb9c06eac55e6bb900..65878904217aafcbfc9a5b1e7a342be86e28a54f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -70,5 +70,6 @@ petitprince-14:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 4c40499e7069f5067cad1f61be58056fcb999ef8..3f597b0be42cbc48b85e15568f53d8afd8e734d2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -70,5 +70,6 @@ petitprince-15:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 7e1084cd71f63e6e2aac256a843a2601e5eae87b..e018291db0ca9e47fb4cab848ffe32b7f8b792b0 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -70,5 +70,6 @@ petitprince-16:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 7a2066d80ec8c11858d8910f0bcd18a01e5c87d6..7737e486b8eb029ec20e1dac69a4ec34f27e3af0 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -70,5 +70,6 @@ petitprince-2:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 3078e87d8428de6771a3dcf86dd47445194456b8..7b2c156131820002f7186f09a1cf4c396dac6e32 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -70,5 +70,6 @@ petitprince-3:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index 392873b3cfaf405e1980451fef548b9dc1d2877e..1198639efd73c9020865f00f93c919f2554fb4a9 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -70,5 +70,6 @@ petitprince-4:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index 78495bb96ff56f3eb20d8d031c0c68cbf23f1e54..555986e33f7727865e54c2ad68790901f7707d25 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -70,5 +70,6 @@ petitprince-5:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index aa56927d28467919e011615847e58066a006f6e5..bfbd9e4632202f1f4bb43ac4780b5881c6689f6d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -70,5 +70,6 @@ petitprince-6:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index 1847a4835ec4cac1906d4fff1b5d00c3716aa9bf..a84e6d4d395c8fc0ee9baea930cd5c7982e36721 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -70,5 +70,6 @@ petitprince-7:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 6db6872a252565ad7dd6518a4492bc307a1b1d12..d171af3dede4c98da422fe8f0f516665405ae7f1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -70,5 +70,6 @@ petitprince-8:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index 10f8275bf441d30a9964beaa11293abb65e3ce28..858b2646878ea1597dd1036e4797fbc83f998491 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -70,5 +70,6 @@ petitprince-9:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index 8eba4668ba22e841627dde5418812c0029339904..bbae14e860ec49c6b386b04b5c6ceea23e045430 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
index 97ed1f005503360c8589b088963fd7a5c7f741e7..227c694e2196a038a6f6b48477d0358e82a00222 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
@@ -16,22 +16,17 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
         reservation: true
       sdc:
         interface: SATA
-        storage: SSD
         reservation: true
       sdd:
         interface: SATA
-        storage: SSD
         reservation: true
       sde:
         interface: SATA
-        storage: SSD
         reservation: true
     processor:
       microarchitecture: Broadwell
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 8b2e0a5e63c2917a01bf0193f900b12eb8c54cc4..bd34d5614908b5ce954ad3f6b0c64de9be8b2b57 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -179,29 +179,34 @@ gemini-1:
       firmware_version: GXM5104Q
       model: SAMSUNG MZ7KM480
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index 444f1f94136316a62e0a53e1e771f0f71b8068a2..68fa50e6a629749159150ba1e272a1d4dc503607 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -179,29 +179,34 @@ gemini-2:
       firmware_version: GXM5104Q
       model: SAMSUNG MZ7KM480
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3459"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 5f1cbd132a62a6d48c8c066be3abb70d9656e64a..3052c6b27852c51033f46e809c6193f1107e4c4b 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -21,13 +21,10 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
       sdb:
         interface: SATA
-        storage: HDD
       sdc:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index b87d6d2f1d7a06a921e3ca5605c7db7657ef0ccd..9a8aa9eb0ae20738c12fcd9c8648795eb87ec3ea 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -87,17 +87,20 @@ hercule-1:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ce58"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0f47"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 72b41c233355d57492591609e32742528303992c..5da8c07c4778d4a9480ab6628869ebfc4db5630b 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -87,17 +87,20 @@ hercule-2:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d1dc2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7f10e"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 0bf9c2b739b44a8643b696b136163840a486a294..e662e2d7754eb1b826556f752b53b64f6d1b88d2 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -87,17 +87,20 @@ hercule-3:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ff85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e80cae"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 915d4561a410e02cff505fa9714e321057a78c51..5c36be7339370d11653e54e957cc4b6686018482 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -87,17 +87,20 @@ hercule-4:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d2a85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0180"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
index 3c0fe5a1f1d6f8239684dfddbb1a6a793d998a87..253e97821ff954ce7f5ac377dd8e14c170f7f9d1 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -105,5 +105,6 @@ nova-1:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
index 42a7dba486ad7da8e1dce81bb304880f8d920841..c550f890b861aa56a37e57572a7695bae0ac246e 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -105,5 +105,6 @@ nova-10:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
index f5e9e01b8f6e2f2f239459aedb61554e297ad763..b5f52bcc31fd00548eeb4b8c464af192291d24b0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -105,5 +105,6 @@ nova-11:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
index 3e7fe90e184ea7beb7e9a844a9dd6a7256bb9813..ca10084a9433b514d588c790d71ac727a5a80929 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -105,5 +105,6 @@ nova-12:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
index 46f8dea1d0d51596d848c20b37f037b441e7d1b2..b460db281886dbdc5c226186328ce11e44e86b22 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -105,5 +105,6 @@ nova-13:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
index 033b378fa9e7cde375e6b0bb1f4bb3320e0f9009..78f403c51f0c42e47d447a632cf4a0641ec28afd 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -105,5 +105,6 @@ nova-14:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
index af36b6b091dddf3bd779ee775ad87d56a47649b0..70b1b2cabc2a5d44a1846f2154f59e3a8004d9a6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -105,5 +105,6 @@ nova-15:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
index 4c3a5dbacd0dd35241269ae4a5cb48ac02f27431..d145f72533b2f68f99a0bc13fc5293af74e608dc 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -105,5 +105,6 @@ nova-16:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
index 4de54c73443c86846a6c053e4743fdc6dfc9c314..c078660d1cead54dcdb01d82d22b1cd1b91c806a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -105,5 +105,6 @@ nova-17:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
index 928ea927607b5622c04efde2e9ba12175311cc4c..8e27a6992ec6d2b0e639db63a56944b0b132d32c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -105,5 +105,6 @@ nova-18:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
index a677d1320187cfd487a6c4dc63835f1fb1475ac8..7a64670e9f8c5b32494479f7ad1e591b14e79556 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -105,5 +105,6 @@ nova-19:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
index 3fc25fe68dc99bcd7437b0ad2005630d8878e0d3..55545861da33ab54ae0adc8ef21d8d1e7785e3d6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -105,5 +105,6 @@ nova-2:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
index fc06069862fa829adb00a7e6c68482288fd71d42..aa0a883e81192473b0bd7cb4e63a6e466337e8c4 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -105,5 +105,6 @@ nova-20:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
index a4a7b2656a668967c6db66360dd0a79c4141dc2d..7d5df00d756320188a2a9d4323c245f9f3f8bd94 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -105,5 +105,6 @@ nova-21:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
index f987dad3cd634de236eadb43ffd4a2fe84a0d773..a17e6840a8b452e79b637aa68d851dd5ae74189d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -105,5 +105,6 @@ nova-22:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
index b83aa9e533aa9f05d551ed29403ffd545555004e..ff7f497c512dac61cfee71a5efda7c1e99d84f60 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -105,5 +105,6 @@ nova-23:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
index 46ff37551fefab523ff65daab6ef09038ed06b8b..4c3544a0556f8e04819cdedbb044d5e04154f109 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -105,5 +105,6 @@ nova-3:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
index 7f06435612d31ac96dacfc28097071c80ce0628c..78cd2608894d73ef159bd32ea071adfa008eb3de 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -105,5 +105,6 @@ nova-4:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
index 96d9118755fd87914307adfb13334b6f17008791..4b6789dc122ae2b3a4fcb36769cfe75a00eea13f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -105,5 +105,6 @@ nova-5:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
index 8dae4a6ba838dc64b5b4bd773a6cb50f5b1e177b..09cc8952957862f651809e5775087af2bf2ab628 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -105,5 +105,6 @@ nova-6:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
index 4d03b29570446f5f44e32f759a2e210907db2d91..5a0b1a3ec9a3fa9f969cc1ed02686f6b704ebfee 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -105,5 +105,6 @@ nova-7:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
index 80e5892d22cd0889f3740a4740912e071395124e..7cb4700bb460d741f738dd4a4d23ad3e414f2cb0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -105,5 +105,6 @@ nova-8:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
index 71f70488ba8ab900691e3cf8322f91aadd7a1d14..2c409c86991493fd0d71f2edae937128eaf42537 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -105,5 +105,6 @@ nova-9:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
index 2c6785924d3034a45081e85cd4b38344ef00fc07..6ad68e9dd79b725fc299de1ed7f101ab21077d20 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index 74bd1b7bf393dd7b20c4c1b51418af4a16ed211f..b55adee870923fd3a3392e4d19026b0f4809ae7c 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -105,5 +105,6 @@ orion-1:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index 749eede86ffa75591b929b3c6c4891ffd13a1ad0..506f3a14e1f031ab6298807d2a8f3cd16c2ba5ef 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -105,5 +105,6 @@ orion-2:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index f58d679ef0d07ae41396368bb8e3f95f7e7dad8b..ea58aa187b160842b8b986f338cddf76ffbcee17 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -105,5 +105,6 @@ orion-3:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 2e2bde5f50d254ef9719121848b4f0ef32ab5f93..348f50a20d6d265e2e677650d3eca7a1ecdd6e57 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -105,5 +105,6 @@ orion-4:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index ba36afe41df6e97f5f0982b31fa7524f27a0332f..b63ec046785f08de35a19f1d02e62e1f7d9d3e94 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     gpu_devices:
       nvidia0:
         cpu_affinity: 1
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
index 5b2505d7e4474d3b0f4173fc62c3c3e17c8cb9e7..28c5ca7882340d6dc18335659978929edb8d016d 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -81,11 +81,13 @@ pyxis-1:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53daa"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
index ee7d52eccf9e6fad6680305fc0fd8f2879095a02..bfab8f79cbcb6b99dbcd23af7460e7da316cf5f7 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -81,11 +81,13 @@ pyxis-2:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
index 52e3ce8becd810b9b92febbcd053d36708c5b5eb..f629d895506999f91c5c8ef4e55dc7508b5b64e7 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -81,11 +81,13 @@ pyxis-3:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da9"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
index 8ff63b63893d01473673e89a1e04309349ede259..8a4daad04efde765a25516a360dd3a5ffbb42be7 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -81,11 +81,13 @@ pyxis-4:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
index b684e5fdba3ef379208580768750e3a59a09dba2..fcf87814ef3d6e6a040dd8ab28019d3137fea92d 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -34,10 +34,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
     monitoring:
       wattmeter: true
     sensors:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index be637d06cc9de091e66640a23927272495b1aed3..a034c1401b92e48a228d64ef438f5b216f9d64ab 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -68,5 +68,6 @@ sagittaire-11:
       firmware_version: 8
       model: ST373307LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index 5fe0001e5e28b80ddaf4848a81bda55dd9a183c9..53e06ab4baad85b448119fec8fc633acc3f83dbb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -68,5 +68,6 @@ sagittaire-12:
       firmware_version: 8
       model: ST373307LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 3c357243a7a4d42d5fe81db15039a9577fc9cec5..62d044390fdc3cc2df1b8383e4742d30f32a0fa6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -68,5 +68,6 @@ sagittaire-13:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 28cac22ebccc159305d50349002d6ef7f6683f69..bc55f9f24dab5ccfeba500e45ae2815f2e6d345f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -68,5 +68,6 @@ sagittaire-14:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index bc56f72aeda62b609b80b069bf61e815279926dc..c3062e16b8c05248d9076e2d07dec38bd8a3f34e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -68,5 +68,6 @@ sagittaire-15:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 470e5e0af3ba86da54510e397c4a7e6ff38da951..6d5cc7d10ac7277ca85da3a0937bf1751c119b64 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -68,5 +68,6 @@ sagittaire-16:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 59ae482e6c13c82b35411576582f9cd486280eb5..84651978881733ad5bbc92a164d0793d0e20eb72 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -68,5 +68,6 @@ sagittaire-17:
       firmware_version: 104
       model: MAT3073NC
       size: 73543163904
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 4ef763f5f18c80c6aace07a58983bad5af4762cc..3dd80248d82fec0225a13df7be4bfca78c1c4449 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -68,5 +68,6 @@ sagittaire-18:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 417818b7c5a5d856af66b807ee685cd7684d2092..40c301057169d3b7a15b011eceb8513afdc5acd0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -68,5 +68,6 @@ sagittaire-19:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 9107ec5d3b1f98ebc6c0e52e593eba7a7b4c69eb..adf0db894522c84ce5ea19b08314e859270454e8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -68,5 +68,6 @@ sagittaire-2:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index c04891653da6fbd8927ac23d80dcdeab80e5b505..abc567abc7cad462cc45e49f512198f60f1c6502 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -68,5 +68,6 @@ sagittaire-20:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index 36ba0247cece616407a6b9370862c95e55b40d03..4efc4c8c892e9af622b8071f30f37bb05ec2878e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -68,5 +68,6 @@ sagittaire-24:
       firmware_version: 104
       model: MAT3073NC
       size: 73543163904
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 3fb97ddc9a861099874ab9a997e459dd08d11dd2..12fae3eb909046d52500febf7ece21c00d2fa959 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -68,5 +68,6 @@ sagittaire-27:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index 4f3b93b1da9a705e865c46bef2325c30d1d13328..0a919580618d8b9fab93b93c367cb3bed3fc3fa2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -68,5 +68,6 @@ sagittaire-29:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index 2890679838c777fe5f2133d0fd0554c1e6fbc16b..f618ec6ac34fd05955b28cfc9ba451524fb957ff 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -68,5 +68,6 @@ sagittaire-3:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index c9b475fd48cd89b9c4dceafc2362c58ab6fad53a..829b9c22f12cfc4d5da57dfba6bcf3b95ac1cbfd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -68,5 +68,6 @@ sagittaire-30:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index 1cc37b40ecf3a584893741b7b1eb6a319dc7298d..0a1aaef6caaee9c839171ab5747a4aa0ffc39b68 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -68,5 +68,6 @@ sagittaire-31:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 784a1bfaa291833cd199e8a003062a2247cbbc07..ed45194b7923c6cfa62f0f98050d970b66676d8a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -68,5 +68,6 @@ sagittaire-4:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index c94e457a134b3782ab0e10e935fa125664471340..34f7306186a111370ecc7215fff70334d4bba652 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -68,5 +68,6 @@ sagittaire-5:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index fe4bacb06c571b15e383ff918986c866f90780bc..497c958b0cbe2ecc3db884823de2fc8b4b734a98 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -68,5 +68,6 @@ sagittaire-6:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index d4c0316f39d1b10499c5d2f1f6d35a977dab5772..535181e516f0b58066053e561ff232b373f62176 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -34,7 +34,6 @@ nodes:
     storage_devices:
       sda:
         interface: SCSI
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
@@ -70,7 +69,6 @@ nodes:
       sdb:
         interface: SCSI
         driver: mptspi
-        storage: HDD
         model: MAT3073NC
         vendor: FUJITSU
         rev: 104
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 88920fc3cdd8933038faa45414fb789165ab42d4..75688d4adc61cb08e875896b9839b1798f035f6b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -105,5 +105,6 @@ taurus-1:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index c004189bcb07426085d5c3c075ebdd8d4292289f..83d296b3ba419d02d5e2e4f65b494af2f0e326ca 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -105,5 +105,6 @@ taurus-10:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index 75cc5a6ac6be5ec68f07df9ba95330c529e24c33..c54b6c18b06ab7f8acbbcc17a9729d31e5fe088c 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -105,5 +105,6 @@ taurus-11:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 4a793ffb126303d4246e62655ad8b606fa15b2f1..1d71a9c7fc8ea459f27ca3bcb2d7cad54fa8952b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -105,5 +105,6 @@ taurus-12:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index cd19c9c38c0eca5c4573c65f17b93bb7dd7a69ab..14ba9cff6cea159176bd4597f2b36c9474347f5f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -105,5 +105,6 @@ taurus-13:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 071704d5005f378dcc7ff0b04f39f2c8508be678..c73a56bbe4832fd39080cbb5865676b43583ee88 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -105,5 +105,6 @@ taurus-15:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index caee83046d88b2aa6ee0878425354f019fc3b044..a625d6c7ffc3171ba51b677f50ef8be180d5e7ab 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -105,5 +105,6 @@ taurus-2:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index a221afe37fb90141634a0197210ac7e4f93e7eac..2d3c69592df294c2aeec2816780f31926893e775 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -105,5 +105,6 @@ taurus-3:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index bc133aadc4e0cde0fadf5c09e14406c871b60bad..b9ab5d1802065266ba42aea5c7c1fde16a893f24 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -105,5 +105,6 @@ taurus-4:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index a29761f1c2f06adfa6205799c3b5b0b1dde4c8e1..c3af4647367318947d98ac1425809b574a4d4857 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -105,5 +105,6 @@ taurus-5:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index 8b620918fd8d23f2e6559618f2a9793121f45b9c..8eeb8c49a2f6714909d351e53ea3d5b9eaf1112e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -105,5 +105,6 @@ taurus-6:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index ce953994321289d29a669ddeac0c509df291c60c..6f8c1a9bef872eab4e97de7a1bc6dd14f80ed750 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -105,5 +105,6 @@ taurus-7:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 82c0360bf67ab8c05a2f97a6818813c53464e258..006e0ca47ba3c3bf00fdab7054b4aaf73862e1eb 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -105,5 +105,6 @@ taurus-8:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 43b54b7152c902f31edd10cd2523bf42f1f5d921..e6de5b1355aa57b210b936bdca8bba442c10bd9b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -105,5 +105,6 @@ taurus-9:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index cd8a04e230211194f7bd6327f27c8928d75566b3..8efb70acedd25c8d1546be288789276400d18dae 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -26,7 +26,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
index e4c7d9f2a265457f32ce729779faf213f99ca9ac..523e2d45a6f9143d309eb26c4cdc26fe4d97777d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
@@ -44,7 +44,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
   graffiti-[1-3]:
     supported_job_types:
       max_walltime: 86400
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
index 6d8763e408bf0db67bdf2147709f983c30aa23a7..6601d9e03c4a04893ed48cbe007f5480028eaeb4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -120,5 +120,6 @@ graffiti-1:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
index 568b0d17568ec0da3adb5e64f34ea09d8548f5f0..088d5384a3b6a4b78aeb03197f7add8bda84f720 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -120,5 +120,6 @@ graffiti-10:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
index a7f5f65f65593b84d518afd6a14defc134c8d1a1..c16f219391fc0b2a0a1d359a5479da39077a803f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -120,5 +120,6 @@ graffiti-11:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
index 62efccc06681d9139bfc28de8a9961b4c68e1645..2dbfad45642934836caabeab24731f82aaad04cf 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -120,5 +120,6 @@ graffiti-12:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
index 96d036c417e80aaa3f0777e9172e44b52a393e46..e2a7749e8e69c20106c27aba43754bd44dfc626b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -120,5 +120,6 @@ graffiti-13:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
index a17ecd094e2ad3223336f53b3dd9733792d2b9db..4f9bc464eae01680e66e50fd1e9c9815185229ba 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -120,5 +120,6 @@ graffiti-2:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
index 55adbbdfeb713c4a66eef18edecc441a2eba4042..f1f669181e723a2c50a9f54b238c40c05201cebf 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -120,5 +120,6 @@ graffiti-3:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
index 56971d0136560ed66cbbd8e2f04049fc5431907f..238ad502dff48b27458f214e337e1978c8e59636 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -120,5 +120,6 @@ graffiti-4:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
index 656c5833aaf25dbb7bab72de211adeb402c4596d..16dce47ef5751a1364e9be9fcdf306536b1d6abe 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -120,5 +120,6 @@ graffiti-5:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
index d97b29b0dea81943c8669b7441c1e5c97c2d5a6a..59ed4db798a4d8d587abd1c2657807cfd1e3abcd 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -120,5 +120,6 @@ graffiti-6:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
index 15310e847b5e0cace80e6d98c7c8e6c66cfc9519..8eedd36fac09fc59d330dd1d6e3dc70d4d6dba10 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -120,5 +120,6 @@ graffiti-7:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
index c2df6bce5154cb2ce433133003886794ac15b18f..0bb6e2f952353ebaa546bb3f978501130f6f85e8 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -120,5 +120,6 @@ graffiti-8:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
index 38e0b18fe37a398ca5d7b3b330324fff43f7729d..42be489fb87996b77ca10446332386f7f165b263 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -120,5 +120,6 @@ graffiti-9:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index 2df3252d116145877821b676925156675e263f65..4949c45bfc2f9e5c5dc06f174b795f8224024000 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -21,10 +21,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index e912a831b1c997056d0f0a508e65af78fb8c66c7..f936006375cbaffaffe709fd2a2303c41d0f7d65 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -117,11 +117,13 @@ graoully-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41b51f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index 108ef56fd4b259bb1ee554b85191aa7a1e627c85..0b07be9a029d5c36e8f0c667d03bfb1f22c62a95 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -117,11 +117,13 @@ graoully-10:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510003"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index c296223f84facb3bc439e0363e642810065422ff..c92ff4dbf51cc18e35e5d7243a3ea41c189c1213 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -117,11 +117,13 @@ graoully-11:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510db3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index e1a991d3a4dcbd83cb384b14ac42f1205b414d25..9cd08e19bc14dee1420a44e32e61e3f807450566 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -117,11 +117,13 @@ graoully-12:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffb43"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index eda1b463b63684f20cf2d8c5aa418c1d6d004dca..2f9ff3ff409ce1b454179d2d67cfad59a8a6d78e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -117,11 +117,13 @@ graoully-13:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e46fd17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index 773288ccbb344bf874de9ac3a61488fbe4adfd05..0a17aa7c16721a1e96b44824a6f775d7a69284b0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -117,11 +117,13 @@ graoully-14:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcfcf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index ce7431470e140c09bf70c520c93d217a11960459..de43c0f0873f633842277c5091b0491d825d22b5 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -117,11 +117,13 @@ graoully-15:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffecf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index 3be4b926a4bcc54f387fb4409a189174feeb53c6..3ac65de33719c86997e20cc6a5abde731e6190e9 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -117,11 +117,13 @@ graoully-16:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5149f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index df432351c180f10ebafc8629c44fd137b3db12bb..7b674cbe6f2dface6c21883172d9adbf42bcba49 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -117,11 +117,13 @@ graoully-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43a327"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index f56c633cd19220077ab15c6b518e74e3392979aa..57b702e2365d9d981d3306eb307aa44fc936407e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -117,11 +117,13 @@ graoully-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e823"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index f2f3ecd6f1cd3ad57ea1af2199d17c1dd42aad8e..2959665734267821532409b716c69fdaf3653a4f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -117,11 +117,13 @@ graoully-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db0b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index b120cd1df4cec072cbc7d521836ba4dacf5a3f8c..97439988efd458a21e5969675320147edd6b8e19 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -117,11 +117,13 @@ graoully-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 525931b71014585b5202e3b99358b621b0ff7503..6628f160599b68a87dd07115846ea45babe3b427 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -117,11 +117,13 @@ graoully-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index b500e1e48f6d8f0170573b401b107eee2d6fbbba..40dcf228474dbb304eac635c36e157c386a3b036 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -117,11 +117,13 @@ graoully-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51369b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 6737804144050bc01163acf1db23504ac73bdb20..7aa405b24973bd77c72fc137e007c93d78c154de 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -117,11 +117,13 @@ graoully-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc813"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 905848b2720355383457c2b1fc0c0cfc1fc70ff8..065693bbdcfd85acc529c47ea54328f9d3fe8563 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -117,11 +117,13 @@ graoully-9:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 7267a5a39578d21369941d37f2f785aba49d4411..1339ca9c6101e3ab8594bc8e6f8617b63543e0e4 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-1 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 17f7450c18c9087595033e96d5181cd6226b40a0..ba533160be36b521049309430c88f66f7303e35e 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -116,5 +116,6 @@ graphique-1:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index 0c9f992b087ddf1d79a856bda7efca12b9d20e2e..09ecd2e065f8c103fb29c5469c80c5327c08817a 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -116,5 +116,6 @@ graphique-2:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index ba646b65b5390f79d2cfaf8bcd2d16830ca54586..4fcd0a7744fcd7a1fc96680264fe1442f2480bae 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -116,5 +116,6 @@ graphique-3:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 22eedfc0568684d874def68ef3a2dd3e419d47b3..7484afe40dc2e7655b4f83b476daa4e94ca97fb1 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -116,5 +116,6 @@ graphique-4:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index e96988c8fc2d64a1baecc780fa8bd02c175575dc..18ce7f46dcddf8ef3482852bb1fed9a7c6128204 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -116,5 +116,6 @@ graphique-5:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index 228a91f0f75de227242859eb4c8a2b165b898e19..d12c07dfed9594dc5a5a44477a6267089068ff5c 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -116,5 +116,6 @@ graphique-6:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index 951130ff60cf03a9465c68b4223a78043bc2c071..6efeb125ca8791a1fa7f1a5f896b345acc9367b8 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -22,10 +22,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 0602772c5ef9e73cfa947cdf3708acf0202efdc4..fb733a9cac78436b2ec674df218039f4f35081e8 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -99,11 +99,13 @@ graphite-1:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 909f25b4199a3c322222ce783993fac2bb7019aa..20d62f999ff27aa05a9e4a9af5cdd4c6747d6e6b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -99,11 +99,13 @@ graphite-2:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f36800e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index a35fb28c4ade782046815f533a2a85a81753c4f3..0e5ca275197992f537fb8cfc6177c3ed3b2e3d6b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -99,11 +99,13 @@ graphite-3:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f368095e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index 31e0f7796f5876395f5cb789134fb0ed5dbb5a03..854b64bc2c4a751ee2dfbbd4dfcf35532ea2fa49 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -99,11 +99,13 @@ graphite-4:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f368041d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
index f0930c81535182d50a9fa873f1204a78ff15fb88..1614bd49ef63d5f9e54bcb411f0ad4e3cd966458 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -49,11 +49,9 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
         #model: PERC H330 Mini
       sdb:
         interface: SAS
-        storage: HDD
         #model: PERC H330 Mini
         reservation: true
     sensors:
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
index 66d9f784360a23f36773095262daf2b7c0f90031..bde490c1c845d3882a9fe7250e2d83373de9bb9f 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -105,11 +105,13 @@ grappe-1:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665883"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
index 318968b57d887fe6e818f5cabcf0642269aca930..aed13c09c3fc9f658aa93328965ec6620312ca66 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -105,11 +105,13 @@ grappe-10:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e0f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
index f194171eccab546a5f9bd111d6771120af87224b..04ad88c7e3e10d4f820f087a1401281c690f93ec 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -105,11 +105,13 @@ grappe-11:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6661b7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
index fba64a17c874db4b9f4748ba7a82b5da5159b9e6..a40221de21c5af5627e54c922ebedb8863f23b93 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -105,11 +105,13 @@ grappe-12:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6692df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
index 5567128cbe8570f5b15b7272a2562761a74ef32b..cd12e55481c9e431e7b32da75c5c88d540297921 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -105,11 +105,13 @@ grappe-13:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6791ab"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
index 9601265157c785b341ae5d483eb9b994e6177758..8a0a3213962c8396c3b44c6e4c9764f3752b5630 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -105,11 +105,13 @@ grappe-14:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66774f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
index d98da3c5f8ff179fe3e52ec09f5469c2a4fc98f2..af40d3c6b75d6129ff8d01ed140e1be116211ff9 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -105,11 +105,13 @@ grappe-15:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca666e9b"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
index 96964dc1d54a16540aa158de66f390a8e203a31c..64daeae3e0c6d3ee78d94316ddcf2e6e655a5079 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -105,11 +105,13 @@ grappe-16:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6657df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
index f095fc895a3e2ad52a1c568e447c0f90c9617d32..38446c88d619cd64eb0805a1fe115b0a875e0ffb 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -105,11 +105,13 @@ grappe-2:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca662ebb"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
index 5ebde334768127710ba7f4e1c0d12b69369f6832..f203e5933dd65b19e69d6a46e90e5f2062223ea6 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -105,11 +105,13 @@ grappe-3:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6653c7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
index c5ee8fd7eae2aaf7230d3944c5daf7aa9d0e7ea4..1bed58498410d0f0181798398f0cc85317e1063c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -105,11 +105,13 @@ grappe-4:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66add7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
index 2a9a8eef7513be6f230aa8c42c9dc47790af5929..145cdbed255ad2eeda22d488d751bcad1e5c594e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -105,11 +105,13 @@ grappe-5:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664d07"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
index 8d1cb34590d85664201db89453aa7a1d7218d323..6f85aa0141fc289e81821dedb2fe90d5b81001f3 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -105,11 +105,13 @@ grappe-6:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a5d3"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
index 26c0e12e83b0225566211b1273cb95942ea4c55a..5fd8c1b7b01f138ddebee606ab4c01113720ae13 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -105,11 +105,13 @@ grappe-7:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e87"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
index e6b6f1276f6cc7063f73317c4ef043bc4421df3f..839f50ed7e06e8b0cf4b0df3a4cac0e09039d08c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -105,11 +105,13 @@ grappe-8:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a3ff"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
index 5ffd0e3ed9962313347539baf7ef97cbe289f1db..071acb1eaeae52a476ed5bf3bf16c987e5e1ebf2 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -105,11 +105,13 @@ grappe-9:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665b7f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
index 3065d44fcd2ce362bfdbc1dae6ce3af705c12715..6a2e1a3191aa6ce9b2fe913c534d102e6963548e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
@@ -39,7 +39,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     monitoring:
       wattmeter: shared
       metric: power
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
index d9fc976b3813028f42d2afa9f0458fbb240c9203..f1baf5b9f8b45f8b6d11d5d11dc63bdd6109751e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -81,5 +81,6 @@ grcinq-1:
       firmware_version: GA0F
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
index bd5795b9b91cf25af40371c919850374ae203d24..a6d3f3bd454c156775e76ac5e74b335aa5768bf0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -81,5 +81,6 @@ grcinq-10:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
index 33371b147b397a61c2cddd6c437f60ef0acbefcc..e12dd33f4e3e6bf5894de77d7f9c8020ecabd7fe 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -81,5 +81,6 @@ grcinq-11:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
index 56b45026fe86ddeb1eed501421d3ad6b999f4e38..8412361bc40095cc92451f239c94bbc1387028eb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -81,5 +81,6 @@ grcinq-12:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
index fc978ff05dd1c764df7fad93ff2002764245db0f..f66f32e0611de10723cfe2ac68a5d73d4679bfd2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -81,5 +81,6 @@ grcinq-13:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
index 95c7b97a258b0186bb1818883278bfe68d09db03..da6b35304d85170af39e8ff2f38dcd151867e062 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -81,5 +81,6 @@ grcinq-14:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
index caf37c471f073d3f8b1291f06fb82832cfebcdb6..d8804ca9e6b7565ff2cbf85b94779ab0e44f1250 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -81,5 +81,6 @@ grcinq-15:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
index b2ca78436d4efab41f66cded17889d1035bef1e6..1baf89aec2c4963e03a2ef257c71806064effbfd 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -81,5 +81,6 @@ grcinq-16:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
index bd2ff9e6d2bc4e078c139d36f7a73e6a92acab5f..194d94640019faf5add663c1f339713df8beb3d9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -81,5 +81,6 @@ grcinq-17:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
index 7eb393786387a5d75a8052f8018a8c31acbd37ec..5c45ff66e59b10c5bb383380b627d5731657c095 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -81,5 +81,6 @@ grcinq-18:
       firmware_version: GA06
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
index 8c5475c317395612ab7f03d6ce3c8ac9e0dc913a..ed254ef1a2975e34d64c60f50edc1e8c9fd24241 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -81,5 +81,6 @@ grcinq-19:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
index 26d0cd7ff7b66bd1ed4043ae4e6a993706872ce9..cf98f090574bd1807b099c6dd4f1badd7c30c605 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -81,5 +81,6 @@ grcinq-2:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
index bffc81a23027c2464950cc2fe74fff255bbe5060..041c3daafa153214ec6a14dd83d92a2cdcc5de5d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -81,5 +81,6 @@ grcinq-20:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
index d6509be8f38ccd384df94e6b001b0dc19059574f..a6e88c398a20be749392de701a505262dd1aec8d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -81,5 +81,6 @@ grcinq-21:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
index 8e778164fbcc285e00b5f30d56bfde67cc368566..1504bac4bb60dd4d4fa024896a51034603a90a09 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -81,5 +81,6 @@ grcinq-22:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
index cebeca59f96081c9929e0a7f923f9dd454c9743d..9ef0528c28b0b9f5c220a815bfaf1c4df76cbef3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -81,5 +81,6 @@ grcinq-23:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
index a1850812c644130fc1278669a7256b391083fff5..fb1b15573fe6084244bb8749315a96ae08f782b0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -81,5 +81,6 @@ grcinq-24:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
index cf23109ad446bf9a189bfc0c3039a99aad6b2d91..295d96c6145c60a5b158bb27545733be3f762710 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -81,5 +81,6 @@ grcinq-25:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
index 12e9cd2c33712399b0fba9181a58a93dfc57c32d..6c74e316f4b97aae3ef3bfca066c60aaecee8011 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -81,5 +81,6 @@ grcinq-26:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
index b7c9f5139c5f23757d06f110368af16f153d1016..95e201e3f6974d1216a580c7e2910b9301b95fc6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -81,5 +81,6 @@ grcinq-27:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
index b54dcfee48cb72da981242b19ae94043a2aa0371..398e870f0268064722faf8db75ba47852a2a3570 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -81,5 +81,6 @@ grcinq-28:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
index 7637d6aee82c1298a9f34e3e8ba974bb7231c9b1..0bf1b53ab6dd7abad6d3359972482beb944d858b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -81,5 +81,6 @@ grcinq-29:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
index 1c777870c08814c7af706a4eb2788edfb8ab957e..3ee2aa415b233d61ee75ae09e634e64f032260bc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -81,5 +81,6 @@ grcinq-3:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
index ee1ada806806929d946974ae7fe8e6217c29fc71..ce848a9a6389ee85d2cf909598e1ec374e7841aa 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -81,5 +81,6 @@ grcinq-30:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
index c1879c0d1f9eb08d8b81e14132d4c3e178be577d..b3c6c0f4fc76c10f974764db0428773b661ffe3e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -81,5 +81,6 @@ grcinq-31:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
index 70fe659c9459e9c0248aa6c82e541eef9c685e20..bfd8c65b459acb2001143afcae889250fc733396 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -81,5 +81,6 @@ grcinq-32:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
index eb88788f74282ae46ebad954f830de07ad538f52..4d2bd1ad9e237670387dc52c7a625d3cdfeb03e2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -81,5 +81,6 @@ grcinq-33:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
index 092f35ef5e7047f902e2fbbc72404b6be724b4e0..68644a989db4e3d9763f5a15c75f8d18f2593d8e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -81,5 +81,6 @@ grcinq-34:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
index 286e29e55c1ef54bbe201a23e9ef5e9e6bdfc5a2..f94b8e4c77fa664fb8ff9bea9978fccfa08e37c8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -81,5 +81,6 @@ grcinq-35:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
index a8d6b0ed330e61fcfee6d456629ea9ba351a8879..28a872ae18f46fd7542561b6f4e21d610f76d7f3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -81,5 +81,6 @@ grcinq-36:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
index 44a1a7e1afa3c85bfc0d5c7b62ccfb7e238ba1dc..2dce411626d4217f14f7e066a72c270382967436 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -81,5 +81,6 @@ grcinq-37:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
index 25a910d0d0d26cb427ffad7ff95d4708d54bbc22..e54f92385e0b91655a0292c9864219b905a3b4f0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -81,5 +81,6 @@ grcinq-38:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
index 91c79e850f3cf08541c7703b87a28b28733c3341..5b22938642d62d8bb7a263358a4f447211f78fe3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -81,5 +81,6 @@ grcinq-39:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
index dc7e3e9d56a5025e19d0f51300faf8fee058c889..55a446c9ef4a5f58f26502b5fd95b1014886a1ba 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -81,5 +81,6 @@ grcinq-4:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
index 4b57b0fce45bcba525a0da335de56119b78cca2c..62ed14719ca3be6d25a95c06327579a0d793f6cb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -81,5 +81,6 @@ grcinq-40:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
index 214d99a69f9023db52ff25d8194524d1db4539bf..57508b33debd6e15defe8b6eef9650c8a6524669 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -81,5 +81,6 @@ grcinq-41:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
index bb03f32c46b1c980b9494901828ca0be5722b066..beb04cef55ede0447e2f5da1de96cea42df00e3f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -81,5 +81,6 @@ grcinq-42:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
index e84fb28767da38f5723a9cd48c2674ac0025824e..335281a772ef16adf72bf9e15c302f7c6d978cb1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -81,5 +81,6 @@ grcinq-43:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
index 143a6cf317f6a3b3732d3627972e209ed386b17b..d4da80c75caf2c7776decface940a079726737e0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -81,5 +81,6 @@ grcinq-44:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
index 1cf62d5297f2daec7b71a0bbdb162d73f3cf223b..6421c4a1b1f3f11829b4c826816af306ac25ac68 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -81,5 +81,6 @@ grcinq-45:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
index 5bb3c1513fede711788642513bf0f45e3a657b58..c70484f7e464520863e82de7896bcd53b3600b30 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -81,5 +81,6 @@ grcinq-46:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
index e4d4616afb1116ada0319f9780aaf2aee38d0df6..c1a1534220c332a03317bfaee990f0fcdafeead0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -81,5 +81,6 @@ grcinq-47:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
index 4d5d01cd5861e6c81daf5be8ef4e67a92b0e5341..ba654a82e44ad71af3d71c3b66bd560d6c7d43c9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -81,5 +81,6 @@ grcinq-5:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
index 8abfb79392fdb160f24001b80509e287117d1e7c..5282d76c80c98d4d10f69da6e4212ec261fa9a3c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -81,5 +81,6 @@ grcinq-6:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
index 21b87db8c92968a9b387fd800efb52ed4979c126..4c98a8542a55adf1e4d32010228a6664360f1b9b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -81,5 +81,6 @@ grcinq-7:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
index 3cbff528e18ed08510ce17cee2bded0d5d308c80..7bd4bb151fb84e61efc8f41e8600f79a4c51bb43 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -81,5 +81,6 @@ grcinq-8:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
index cc932049b126cbe77c5743365759f7de2e35123f..12a546afaa842abad24f78f53e981b987b267b4e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -81,5 +81,6 @@ grcinq-9:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele.yaml b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
index b6dc6a0d2467d4e5081280324674f482277ffa5d..0e4b95970edb09c916ca6d3358e25fea84a7f76b 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
@@ -51,10 +51,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
 
   grele-[1-3]:
     supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
index a696171eb4b396e8351641b453e826802fdd5eea..c777a491ffa4e8893d147e7e670b91c128784789 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -116,11 +116,13 @@ grele-1:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3c049eabaa"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
index 1547db01aa92d196c6ba4458d0a67b5afc056ffc..f629b367a92ef197636c5dccefcf0e8c9e9d0b5f 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -116,11 +116,13 @@ grele-10:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032e04c5f7ae"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
index 17c2277e6ccb9569c3348cf961a87e6c2b544e4b..f96a5dd4016acc43c6eaf6cece45734ecd897d83 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -116,11 +116,13 @@ grele-11:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032d04c9185d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
index 02133e8dc8eb36b4817999e9c228e68fd1872cf7..738ef0b4699b1f0fa48bcfcbfb0cd2d156a9a402 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -116,11 +116,13 @@ grele-12:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04c2acf4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
index e4ac3ada5589f52cc27c8f669685039464520707..ee40ee42bb3519976f6760422fad3e77dd3a4419 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -116,11 +116,13 @@ grele-13:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032e04caaa9d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
index 68b5b85c97925e7ec5c2bfe3f853aa5bce841991..4617a57c68c813e9a0fb4aa4b50494a439eea17d 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -116,11 +116,13 @@ grele-14:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04c25600"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
index afbc9b173d90f8baf7d32f8dfd84e882497cd4db..3cbf5b882d6452bd0e41105ca4cf08440c1dad96 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -116,11 +116,13 @@ grele-2:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032b049a2ad8"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
index 7a69a855b39729259bf77157577f19e80fe535ed..5f6e9583aafcbb7ecd6f8fcdfb7f17dc54eefe72 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -116,11 +116,13 @@ grele-3:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032d04cc530a"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
index 850025399270796c78573f1f1c65695ed0baa527..f0e57afbc75ec50e7bae595e5fa3eb09cc18388c 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -116,11 +116,13 @@ grele-4:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032e04c8712e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
index 737be1e52cda005069c84c485b219eda4ec209f8..70ef45fa149ef71a6c3916dc5f1e7d69c02a38f9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -116,11 +116,13 @@ grele-5:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032d04c354fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
index d25475ee2e0ff31bbad32cd9bbab1e380597d19e..8f8dd11fcb80518f6c831e166cc021b39c0de947 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -116,11 +116,13 @@ grele-6:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032d04c8387e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
index 61accc721b8c5a1c6a51e168878fa8fb36dbec45..2d790fa9a015f4030487af3beeaf6f7ab4220022 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -116,11 +116,13 @@ grele-7:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032e04cc2521"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
index d63330bed278e158cda0fdc3fcfa5500f6ae3212..e2d530b34cdf3efaafdbb8c8748e67922d3f2166 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -116,11 +116,13 @@ grele-8:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032e04ca950d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
index 2be95775012c89616c00f78c9e9f837f024c6689..d917d88fd77e23d08673ccee79c8db58e47d951f 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -116,11 +116,13 @@ grele-9:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04ce0efe"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
index 045b630bcd0e88c3c8de5cb6d1674e7ea173fd71..1b33ecc3c2419390ed62f377bfbd4237f534b64e 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
@@ -24,7 +24,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         mounted: true
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
index ce8dbbd34d9cbbbec1fc799149aba6be9d1766f5..0e4bf1256a9de499977c387dc143c600de0cbb4d 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -116,5 +116,6 @@ grimani-1:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
index 769bb20b0020af1bc8f49ad92f370ebc5457f5ff..3512aea002dff0a0d9f45edce74774550da126f0 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -116,5 +116,6 @@ grimani-2:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
index 01d7c560a7f56e2ec207cef8c90939cb5cb82424..8e90715fc1c4827ee9734762826561e6623c84db 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -116,5 +116,6 @@ grimani-3:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
index 767c9de578514b3ae1d636995432594c84e38430..9648e3263781170e712992e4807159f5e8bf1c5d 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -116,5 +116,6 @@ grimani-4:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
index 19e60e66a239ebcad3abe8c9a832fdb09c267ddd..091b6f965580854f2bad1359a71c9b949988c672 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -116,5 +116,6 @@ grimani-5:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
index 66b4c3c18f7a49476a76fcfba9773449276b4b2a..d4272a69dc1e47185b2abf71cd625488dff6b364 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -116,5 +116,6 @@ grimani-6:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
index 49b99cab93caa73b4843bac161f26a14459fb879..df5d632da24a93c1e2af85f90f0f110d355eed42 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -22,26 +22,20 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: SSD
         reservation: true
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index be95b7871234f5d36e5b9d314e1ed12eb2ea7ea8..13262a26f63b10ed3924e33eebd3aca7352cbecf 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -120,35 +120,41 @@ grimoire-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f88af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4df"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index 41f2316d58d3662fbf1cc01815fd63a6073adb77..7273428262867503e797922a3b3914766feffccd 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -120,35 +120,41 @@ grimoire-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fd00f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f92df"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f948f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9127"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index 1082f868112acb2789a45736123129d6d2be7225..b7fb4f726396e3f85cc4e2413dab533f1d0d7531 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -120,35 +120,41 @@ grimoire-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513acb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d657"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513eb3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b07"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa284"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 7c4e727ea5464ed98fc3f51b37e538bed646d1f3..1caf7e9b2a30bdf4495d8b3160f68c159f2c1bfc 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -120,35 +120,41 @@ grimoire-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5261db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dd57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e500297"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5013af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa634"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index ab5eba03d4e2eb0800e66c692f36b83b3e4f672a..0fd6715fcce4f25562c167c145d15f564b9ec154 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -120,35 +120,41 @@ grimoire-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f7b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ea43"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51440b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51465f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa61c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index dc73cf587281edf26791a54a30f93346a38b490e..7bd4e93df3d46ff44ff0a45f829f1c601b20dc1b 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -120,35 +120,41 @@ grimoire-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f920f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f99c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2b0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index bdce5a15cfce3541f3bee777e1ecff49e2bb876b..49c6f2b5ac09666eab5097a98a789d4e64fc777a 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -120,35 +120,41 @@ grimoire-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50cd8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501393"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501a77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa608"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index c231d60dd9dd6b396e6be406b2c483faf362f495..c828ab2b57e8565972ebe0de48195bc7f5961dca 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -120,35 +120,41 @@ grimoire-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8777"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcff7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51004b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa65c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 7b8d40f6fe3ce59e78df037feb29fa7a7cb1977c..cbb0ccd8f6b03a622edeeab56f4c8bd3e86521ee 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -23,10 +23,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     sensors:
       power:
         available: true
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index 5622eccc670f02306e1b36b620d08e7b26bedaa2..f48cf52e509881036365d8e4eb064d928c054cc8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -109,11 +109,13 @@ grisou-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510fe7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index 46ed401755e9c155133cbdc1d0a4cc86acda7d8a..9d1a109b691d811c41b774a35436af7b2fbb1495 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -109,11 +109,13 @@ grisou-10:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index d7749f3d64faba3364e93473d55fe48d717635eb..d733a7a48ef745e575e8eda60203c320ba6c2e09 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -109,11 +109,13 @@ grisou-11:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514357"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index 0aff45903073c5e917bb485b2bccc984c43e4e9a..34e39811eff000baa1021d2712d9c68097cf598b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -109,11 +109,13 @@ grisou-12:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51467f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index 6c3b5726ef3c065915da13241a1a9c39381ce555..659109b5ae78980af3dea218fd063fac60c564b4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -109,11 +109,13 @@ grisou-13:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fdd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 70edce12c9f9612bd2174d6c76709b04bbb89822..ca1409b3c60b9b0c908c73a560189f1f35b0aedc 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -109,11 +109,13 @@ grisou-14:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff643"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 81e18128b0cb5b01c29675ff57398fef083a8a5d..70b5ef53fb91151f422bac2ce56202c6edec5343 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -109,11 +109,13 @@ grisou-15:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4facaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 4d21af11185194220361858002152889d51fce34..0e6d2785ae2f6a06d62aa6a2c548ffad8af1108d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -109,11 +109,13 @@ grisou-16:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5135bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index c2fa24aff674641932f8a7fc7762c581c1fe6e31..3d66d347843ad3272e540a90dc29767aed6c3146 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -109,11 +109,13 @@ grisou-17:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510877"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index fcd8c966adb85a78b0b9bde5bd877f8d61852b9a..7ba400ba42e9862f97221a58b6de1a8ae555471e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -109,11 +109,13 @@ grisou-18:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51125f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index 4604a8e5156ca68b6863f493365b673d745f0177..1a7fe3d6cc57b9e774491fc9d92dc99ed6e8355d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -109,11 +109,13 @@ grisou-19:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5116e3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index e06058d17859b56545588d2674aae30e9b331ddd..4bb374fece54696e7b7da9239c677aada255565d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -109,11 +109,13 @@ grisou-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510857"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index 55b4d055eec804128433cbebbef4e6c0aa6112d7..96a26f3c26a2840c07e06849d35d91070fe0f624 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -109,11 +109,13 @@ grisou-20:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dbdb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index 6f142c6568ac4f258b633970a406dfe672dd0e99..12b7d59fa8bb91d703a8a080e5fd4091086ef571 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -109,11 +109,13 @@ grisou-21:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511057"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index 9954448be609c64d8d3ca6b6c01ebe760b9adf4c..018143e1862a5b0eff61c60f0f98adc265bed75f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -109,11 +109,13 @@ grisou-22:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51199b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index 4970546f8ec9c090d396dd140236d46bbc85ae70..236112bdcc1ac71d8b8f79d58ff8efe14e43af60 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -109,11 +109,13 @@ grisou-23:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43c0ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index e411b5fc72086e384fdb7f1c73395e6639a572ed..ecee0100f8808a111e6acb12faff451a8b8bbce8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -109,11 +109,13 @@ grisou-24:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff27f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 00ab0ce1287d7e380990b9b25864245a35d1aec3..ce609cf892d1d5ea2c73b702b3929ecc8ada83fe 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -109,11 +109,13 @@ grisou-25:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e473563"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 1364f77aa2876ab99fd4c8ed9b5300e1b1b27037..6ea0f43bff1e92cbfcf4163d3e5e6ae327f53b57 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -109,11 +109,13 @@ grisou-26:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50105b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 9f32aee01eff84a42162065d97f1c458aba15da7..9c2e91278000d6e25ca3a85cb8441361fab48edc 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -109,11 +109,13 @@ grisou-27:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50198f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 4c0ea468c8f18fb4cc138e213efd3f6826499121..8d51feb06c27e2e4fb829888ea8d210d3c89e8d4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -109,11 +109,13 @@ grisou-28:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5014e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 9fd48d36834582006d4f4b745339dddb673693e1..e5c99263f928f05f749484525df6742084704207 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -109,11 +109,13 @@ grisou-29:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50163f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index 8859a12547d01bfaa881aa300c1900a622c30185..bd8f261de0b4557fa7b5e62b6687907b666bbf7e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -109,11 +109,13 @@ grisou-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513487"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index 6a0beb9d87752906e792e921226c8562dc398c41..9eaaa6c86689bb53f7abc704014100fa440abd7c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -109,11 +109,13 @@ grisou-30:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e522faf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 83da72d4f3a2c94ed39eb21c61a43c87b5b6a44d..0ac2ef63915522167169173cf6d1960adfa70176 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -109,11 +109,13 @@ grisou-31:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffa5b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 91d7943850affdda3b3b2e3531db74e6c3eec091..be03dff8035e0a1dd4118259308547c6085d7cc5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -109,11 +109,13 @@ grisou-32:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bdd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 0a605d55fcadaab5fc7cb5d0d38dfb58629894d4..a7488059440baa2ffaa82a3067bf037363c7e826 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -109,11 +109,13 @@ grisou-33:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index 4845bca4ab1c364a39bbd8a1a4d50b55d08bc5f8..7e6dcbe411080ee42fa8d449cac566c735f864d2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -109,11 +109,13 @@ grisou-34:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50129b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index e381731b1f89ea858d7ff8ccf332ea6fa0f40a05..df7bebdb689b34b2dfaf3a5e20c320a066ae90d0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -109,11 +109,13 @@ grisou-35:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d963"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index 2d7bc2c23fdacbaf355f1fbeb240c15579328983..7700bb926fa9180a895b65814db5724c50eb87ac 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -109,11 +109,13 @@ grisou-36:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51061b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index 65e9422141f5f6aaabb7d7177e7ad714bb7210d2..affcc2ad2a1f035e978a548230c7f03873ca61c1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -109,11 +109,13 @@ grisou-37:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51395b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index ce080c93ae6b29d38ca3cda2a47fa402e1cd2d1f..761d3939affd4f98b4e24c510b73a5ea6ac53724 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -109,11 +109,13 @@ grisou-38:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5105bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 20d6dedefb47a4ec7387fff1ce23180a26113a9a..32bb126fd4c30e9189a9b272973aa94181b80fa7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -109,11 +109,13 @@ grisou-39:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e667"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index c7adbf1f85bf449b38b79be6b843c33843e77840..f398dd69fd6f188869742dae9326c83f422f2a49 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -109,11 +109,13 @@ grisou-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510bff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 1a75726d391adcb6c628e01d8298012140965733..7d57835d471883637dd26273117f41645faaef2b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -109,11 +109,13 @@ grisou-40:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513bcb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 0dfc8dc4b0f5cce66f85aec9b02119c28e8f3ed8..155a2264a28033b69573f944eed3a1a22283e9a1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -109,11 +109,13 @@ grisou-41:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcab"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index 9486cd1a73a6f4322ecfab22b8ed659f9dc4ce20..9f1629ef1baebc49bdbfe6dea8b4d80e6b2fa51f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -109,11 +109,13 @@ grisou-42:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 0a746ffc26f879ac801debcc57abc1607d5965b2..72b3f7fb0b78f986157b1ba038cdb0582bde6cf3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -109,11 +109,13 @@ grisou-43:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5110db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 9e6d3492b0ac867d8a378775668bb98395c138d5..c066271ee2be10667bbad3f0903884d23d97ecc4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -109,11 +109,13 @@ grisou-44:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51113f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index 488470e5d83e4ff3c87cffde4a3ef2d655f91401..b03d5102622692a789169228de1edd291f87e5f0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -109,11 +109,13 @@ grisou-45:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513663"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index c5ed60a6b064efd53b3d048e4cf733a539340de1..3d5a51a5064249b809646aae173496defca7aaf4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -109,11 +109,13 @@ grisou-46:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501c8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index afe262379c28ea2b863f0b7785c72aa117056496..5779378aa850f73b50102efbf0082379ef91bf84 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -109,11 +109,13 @@ grisou-47:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 13a106e2bcd04c951daa0d23dc5a5c50a6f93d92..c78a1508ae5f2a1f2cc514246d33d005f0ba5889 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -109,11 +109,13 @@ grisou-48:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d16f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 4a2ba7922fc3a17506ae25577d05044c7508b500..aecccf2709d503dcfbc6b9c655685b0bcbed2103 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -108,11 +108,13 @@ grisou-49:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4396e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index df9a19ecb16ab0b07b0241fd89163c5495990e01..a74d937b1ab7d73e3c890bf774cb81809ee5de3a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -109,11 +109,13 @@ grisou-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510b1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 98b857e273fde17a9d8120d5343aacf7af9755f8..6efef23bba8ba078e554b2023ebf80a1451c96ef 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -120,11 +120,13 @@ grisou-50:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index a656893355e4a81d77b33a3c3666722640359d68..9577f74ae5209468baeec7e47c19894ba837f448 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -120,11 +120,13 @@ grisou-51:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcd27"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 2f3089476c6051248b53fa42020dfa365d2baca5..1ff20b04213ee9c78074c53d3720fb51a75f5b17 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -109,11 +109,13 @@ grisou-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dc67"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 698763956e33662b8b4e08ac8a8f320430832493..92c1cb4af7af89856d18a60bce3c1ae62ab75cab 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -109,11 +109,13 @@ grisou-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index 27bab7a05e3b7a608654c7a8b504195161233ef1..22c092d2bf210c881d31ee3cc93ce012be70ea41 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -109,11 +109,13 @@ grisou-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510883"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index b4db394a5377bc7b383ef3a46988d62e78cdb816..9adc6827b59fb0c35740aa4fa24bbdedd306b966 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -109,11 +109,13 @@ grisou-9:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51017f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros.yaml b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
index 4a4190a2cffa8a1378407045c0a9d23af6fd679b..1e2827c57323ef2cc5ac8d181691cdfc125833b6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
@@ -35,10 +35,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
         # model: PERC H330 Mini
       sdb:
         interface: SATA
-        storage: SSD
         # model: PERC H330 Mini
         reservation: true
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
index 4464e6be7646ca30ed83a6dc49c19cce7c073716..b9908d43c7ddfccad532e808bffdca004f3d9d4a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -70,11 +70,13 @@ gros-1:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49235"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
index 405aac9d9b7e0c842a78d615cda969078165c012..19b9e1d6335a4dd5785eba3eae1423764515002c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -70,11 +70,13 @@ gros-10:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49344"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
index aee6224662739f591d34c54711cc80cf88913c8b..e5e5ed5b9f2e059a239e96fdd8019752cdc6722d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -70,11 +70,13 @@ gros-100:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
index f10495348e61c2b3c2db373509ccbae3739f865b..fc34caa4817491b7bf61f0d76cf3e62bc047b19f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -70,11 +70,13 @@ gros-101:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
index 5af96811bfc972fee0df79912e0cd2fb65771c52..70d2f915f086fcd9233b22727798331bc4883aec 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -70,11 +70,13 @@ gros-102:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f72"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
index ee87510d379e0395c7268515ccb608aab42410b1..2c0b90554f1b2044a583a2aff70b9443744c478c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -70,11 +70,13 @@ gros-103:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f3f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
index 6a82d5e4b940f03f5255d26da8cec39b8fef1525..dc9a47cfe7108f3390c64fd4f50da42d15512765 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -70,11 +70,13 @@ gros-104:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f94"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
index 1e27ab4ec77c331f3e88a83939c7169c0000e65b..f18dfd4634213da2990eb27d61fb2ac15cf468d9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -70,11 +70,13 @@ gros-105:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
index 9bd40d4b259d7fe45ed6d0360e70e4c6b71490c4..c2a338faa08bc0cacc48dde5de7bf6abb937ef46 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -70,11 +70,13 @@ gros-106:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48491"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
index 1c93eb22eb3af49e3f0c08ebdbbf8565f695b3de..a356d37e2b3d6efe621b976d0e0ddd3f91e95cf8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -70,11 +70,13 @@ gros-107:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48230"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
index e981cde57848197eb619f37f51cc2fb9e2e6a4de..2755bc33b7f601a68c602763e591e1c1a67f4008 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -70,11 +70,13 @@ gros-108:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504cdc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
index b6b213e6bc831f898faf46b86e2eb6323758f984..0f9a2c4fa51ce0ec52abfc33033e25f2986fada2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -70,11 +70,13 @@ gros-109:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4aa84"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
index aa08b9cae66100509e4d8080d8455eb798a442b7..18dfd1d760e559e26edbe7e471ba8f2aec62df69 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -70,11 +70,13 @@ gros-11:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121503a68"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
index 6dc3f4c6ed5bc090e0d1b2e42c64caa05811b611..e3a85a0ec9c5509ec2672a485f52c865d836cab9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -70,11 +70,13 @@ gros-110:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
index c9eb709efe135cefeb888bf69c4dbcccfe00d418..71fe09627101cf6d6691c0141a7ae72e91e36ae4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -70,11 +70,13 @@ gros-111:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac1c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
index c6d9d917ce221c5ee63f47e54906896451d3fc8d..5bdea2d610302662cc3759617d023da318e4ba2d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -70,11 +70,13 @@ gros-112:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab50"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
index 7fd043c76ef1f62c958f883d898899816bce9612..ae98a7eda033a3ffc4c8e22822d54af84390c323 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -70,11 +70,13 @@ gros-113:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abfe"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
index 852eabe81b4a9e668da465e2dd616cc3a3b0b6cd..ee8b40cbcd16d17481dd26ca7ca278b17b234a09 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -70,11 +70,13 @@ gros-114:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab04"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
index a7fbf305bb4e4d71b5567729c6baaf0c41331b5b..7f8908365f52189b66dbbbae1d746d6436db0ae0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -70,11 +70,13 @@ gros-115:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48793"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
index d611f2ff6f7d2b65f7a62768d61b6d106240f9b8..75a0bbd9d82df681802412f72b033230d313e027 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -70,11 +70,13 @@ gros-116:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a487ef"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
index 1507d34d0bfedbf8cc4484f787a1d43234930c5f..bebd5dbf1430de8146e97ab04d73618edee7f9fb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -70,11 +70,13 @@ gros-117:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488cd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
index 5c51717225157583303efafe49366761652b4c79..514ea411412553ae47dec9b996458a23f8434ff6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -70,11 +70,13 @@ gros-118:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e77"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
index 3d7558f000f280bc2c1aa8093ca0850ea452aca6..00f7d6f4096d3abfae0bd4e36d2952ccc7ea2ed7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -70,11 +70,13 @@ gros-119:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a24"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
index 21441d061594349476fc4b7555eb9d4d280838a2..af057a11369f6b0cc83872bdb8f304f537cb26e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -70,11 +70,13 @@ gros-12:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
index 8fc8f10a4e332152d69e8bf06add7093f585408c..be2948e5a117a26a6926007c6349f4bb8a82c631 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -70,11 +70,13 @@ gros-120:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a03"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
index f7883c84f6772ce48c34bd50dd8768fdfebd9125..5d7a91e3670a8901661c69909f05fac749d083c8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -70,11 +70,13 @@ gros-121:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a56"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
index 1560e95c96622d572fa61c439b108b2f3acf8ddc..7c722dddbc60e25b40d0f7f03cb596bc035c22ac 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -70,11 +70,13 @@ gros-122:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489b4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
index 8768c1179506a0877f6bdb5aa252e7c2e9beaea4..96876bed282a34ebd6e2eb8faec3e0c4195caec2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -70,11 +70,13 @@ gros-123:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
index 45735e2a2a476b171e4504c3b72c57f10c93a861..d30dac0ad12702bb349c4fc9bb58873cf1b8cb99 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -70,11 +70,13 @@ gros-124:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a02"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
index 69c89a2ad2b81491335af1ee88a1691713a4aa9e..025b0adf39dc68d88a9f6d6a476222d846ab9a98 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -70,11 +70,13 @@ gros-13:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215033c4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
index c22cb05029a85fff4ce1776ae58305627a2288c4..2b4719b63697b353371f3633dcfc0a53553cac17 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -70,11 +70,13 @@ gros-14:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49251"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
index baf1bd360cccec94926dfec389714b729a371164..cad0ba3eae188ce6117a668998f2e22f36cafb08 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -70,11 +70,13 @@ gros-15:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a490ec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
index 6e1ff3242ab3c8119211d7892d45b1b5f62e1bbf..ec56a7e445e4c60b1012c1f68e2d38ef150ec34c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -70,11 +70,13 @@ gros-16:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f76"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
index 5f30acee5f445c1ede57507f27ea8cea90cae577..5023926b30c7bdd6bf052ec621de650c14d5d665 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -70,11 +70,13 @@ gros-17:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47fa2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
index f69f11a1ac5a035dc3d69807a9374b46b8de02fe..0683ac07d0c64f3a2ed9f967474467278db3c27b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -70,11 +70,13 @@ gros-18:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48215"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
index 0a5271a292d56d8a0ab6edd7278c291941e4f603..b6ec4cd2295ff884db2412b209ae035a994bce53 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -70,11 +70,13 @@ gros-19:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
index 51f8a028493f696a9e221e396a29e931841d3bbd..636d152578d2a64cb9b035ac8ecdd94b37e4f609 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -70,11 +70,13 @@ gros-2:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49089"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
index 8bf0fd547a24d7f291f899be91b85fe4fcfffdf7..ca42f537b1c2087a4a76f47d9f0c52b22cd8b7df 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -70,11 +70,13 @@ gros-20:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
index 6a28ef801c55da517b3e54dcd3d92f82ea49da61..a1dd4cde92e9726de9db075fd826a9d7d487088f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -70,11 +70,13 @@ gros-21:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b5b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
index d631ae04bab6b0336cd9ce250522f64b791c8dce..9fc2c287c02fe012b10b18db3154e48a5d91528b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -70,11 +70,13 @@ gros-22:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215042ac"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
index 5ab39ce113389661f844e14b2289f6817bb65b31..1939555bd0b60e205a6acce2ec60dafa3313e805 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -70,11 +70,13 @@ gros-23:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
index 4361c201bf29045ab16a90e1f9bfa854af707b0d..c53871902b0cd4f085ba0d07efd5192a39a9808f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -70,11 +70,13 @@ gros-24:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040bb"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
index 9126b4a680f27d49a44998041628601d44ef373b..ca84c958d309c4b1825c1125cddc81ccb705d638 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -70,11 +70,13 @@ gros-25:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b66"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
index 29d4f8ab066ec09789bbcf443e1cfb3807c7ae5e..b72acd148384af296c1d9a9a6b364eb784e6a371 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -70,11 +70,13 @@ gros-26:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a43"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
index 1055cab54c958c76607ebb34520afec5e3a235f8..018f938021b88f42123ca0d708b42aeee42608f4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -70,11 +70,13 @@ gros-27:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49aa6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
index 1493d5bf96ac993019421fe79dfeb8a2178d362c..ccc331b6e48de4391ba41f77e6a1bbe413364470 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -70,11 +70,13 @@ gros-28:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a3a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
index e0b200198ab1a053e8c47a333c532b87c4684dcd..4d94e8bca462bec4fcb54a1ee9235e294df11f76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -70,11 +70,13 @@ gros-29:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509965"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
index 421d2defecc09ed64eed616a9911c583617ceb44..0d19a495c954275171fe095f1055f245f582ba78 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -70,11 +70,13 @@ gros-3:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad83"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
index fb6305079b11cb99f3152e00dfb9c1d50814d1e5..dc7ecc49efff13a2fe578caf9382138190733067 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -70,11 +70,13 @@ gros-30:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b6c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
index 74318ca56608def3fdd217d7d87cf3ca4f71603a..252aceb5f01509d86f1c4d2261d2e20d5ad58c1a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -70,11 +70,13 @@ gros-31:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab2b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
index fbea18d12e4f5f7d036082622cb91d180217e725..4fbd304a2c356fb0ccdd724d3a6afb691b013cf1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -70,11 +70,13 @@ gros-32:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
index 97ecf878bbbe005c5a19333fb0c59738a8fab5c4..3e7115575ee2f69e9b5ecb1644a02ebc7d2c8f3f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -70,11 +70,13 @@ gros-33:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48327"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
index 275ac92528ea26fe6f11bee3ae2cc8ac8f6d1325..a98ec6e6a2596cbac5019216f79ecbc16766286d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -70,11 +70,13 @@ gros-34:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48249"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
index b5b2e40f3bb83d794b5f57de9b74a3118fec4fd6..417f17667a04965926ea5cf68ad81c488c150a39 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -70,11 +70,13 @@ gros-35:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
index b13f726e78762a5114c8a7e8c68ee39fce37b5ae..ad58218f3af1ee1fab2e80f81984c64ce84e22d8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -70,11 +70,13 @@ gros-36:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
index 9465dea3fef59b561ed5727d135872c44124dfd5..e2771940cff3e39bba0c6a40e75f49a39d42d20e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -70,11 +70,13 @@ gros-37:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
index 0462ee5087a53eaf75f77960ad240fccf489944f..8922805488629be59b5c6f39cc759d958111911c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -70,11 +70,13 @@ gros-38:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ed6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
index b16247e8455d2c47f0233cbd3dac1bad4dc6d1d9..2eb8223c83ab7e4ef498dc4a89ab2a47505b32f6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -70,11 +70,13 @@ gros-39:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488ce"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
index f74b9028ec0de51e14d7c110353b5541d10c3bdd..a9550c88216fedc97ffd33643bf2a271eb7bd9af 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -70,11 +70,13 @@ gros-4:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a4e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
index f831fe3eafa111ababae7181928467d918510666..fa686e207cf92d0c5ce8efc2ecd7331c026b672c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -70,11 +70,13 @@ gros-40:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
index 7e70213420a550d36ec8919d513b64d135c47f85..f3f031da3e87e7576dc32e1627dde96181cbff6a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -70,11 +70,13 @@ gros-41:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
index 4b78440ab30a03dd2d07e24f5d7f5c976b29c9bd..fb6bcebb83c3ba38f7da21087fe76ee2eb760f53 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -70,11 +70,13 @@ gros-42:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b99"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
index a3dbae111540727b07c9017937e79730bb7d5616..157a68a3b453307ac916cdb32da1a6f0e3cca031 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -70,11 +70,13 @@ gros-43:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49159"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
index e898360fc85de33b5a6ffb7d3ad1455694b208fb..4e88662d1c8b9ed7718da48ee9ce4a1d96cdfd2b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -70,11 +70,13 @@ gros-44:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49160"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
index 71233069c556f6a81f7bbe4c088600031c4b629d..eeeab6cde4a8fa5f8110ba7bb936a376bde03767 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -70,11 +70,13 @@ gros-45:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504ad1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
index d046f08c7b6a5db1c65d0f71ff6a28ef8229946f..50278f4ca5be3c3d96f9976eb23892c7c9a547db 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -70,11 +70,13 @@ gros-46:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b81"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
index 089c5bdb9e9e4bc0ebf73508b8945b225581d503..563c49778cf2f74d43fcbf3e5aec71384d1a210b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -70,11 +70,13 @@ gros-47:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121503f48"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
index 3d6bd6cd1bd3b1dcc3e36c5fcfd185a100a94311..e35b2dc1d84105065d065e12f9b8ba61cace7664 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -70,11 +70,13 @@ gros-48:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49247"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
index b1462ff6d6bfb10b71326e302b89278cc63aeb71..e249aabf135eee6792e0962022b23887c6e74cb5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -70,11 +70,13 @@ gros-49:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49146"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
index 77a7f25fd24e267d806a0322920a230846c56ea8..efa29ea8073a2d55551ff5df30caffab6c251d0a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -70,11 +70,13 @@ gros-5:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad4d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
index 188306c1d92d8ad64c7a06d06d68ecfa9fc85f69..a507fed59e32c36fd43671cd51801a22ef482bff 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -70,11 +70,13 @@ gros-50:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4912f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
index b9b875322858f8323e4bed86470d02f23aa4a090..e41b2fdae2d30c07cc170c5338833bc1cc3d8152 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -70,11 +70,13 @@ gros-51:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4911f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
index c00f531ab2b64a7ee713d83bf3aa666b6b091dad..305b84a6d7b0244f2f9df2b4f994a10dfb9f5206 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -70,11 +70,13 @@ gros-52:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac25"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
index a1ee4aabf42fd0d61c2feefd82b9faf78498e164..1988dfb3c896b9ac91302dd5c20564772973d404 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -70,11 +70,13 @@ gros-53:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489e0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
index 6e3346dd95b7837d615b5b41ab74a5018bd6aea4..1eeb6c31fd790eda7b42db7e269f3c99713ad892 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -70,11 +70,13 @@ gros-54:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4acb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
index bb7f21c25c4209cb73775bd095438cb0ae4c45f7..519329b24951adc85af35a17658d82139bdb0623 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -70,11 +70,13 @@ gros-55:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49120"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
index 46c45f950327844034b1555dbdcfd1497d4851ac..148dcf4d0c4db5575f3be4072287b266ab0a5a96 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -70,11 +70,13 @@ gros-56:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150439a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
index 5d2848298dfff88469de6d988687ddc026294f7f..983b4aa0dc9881f75ad472c7017ca1ef2da0218a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -70,11 +70,13 @@ gros-57:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040c6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
index a8bbed4cebea2344d9fd7cba390a297b73f3f388..0b6330bfcd9883849afc2d05c22b558048dbccc8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -70,11 +70,13 @@ gros-58:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
index 5cf9e8e0728e611872ea6fc78fe467c2885aa3b4..bd26eb7d211bd315c6516afe0485b84ae095494c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -70,11 +70,13 @@ gros-59:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b08"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
index dff58790bda5a9ac67fcb58d6ed73bd99c953fb4..42108311019739531e6dbd2c7e052f33d1d2d142 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -70,11 +70,13 @@ gros-6:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e1b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
index f1fcb4005902531582599fedd49267d238a9f92d..05853ea6b13fa597edc349ece0cf1da9936bb749 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -70,11 +70,13 @@ gros-60:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
index 6f070f4e3c0c4e2d8a7b2d524b6b52fc9cc00b2b..f9874c1c94fabf6ace1cc42be11b1c9b330ad866 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -70,11 +70,13 @@ gros-61:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48430"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
index 654f35c396abec3574f9d204102cd52c8fdb3213..6649f70b19aa8baf1ea9cae8f54246e7ec9a2773 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -70,11 +70,13 @@ gros-62:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48526"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
index 7298ec3afb1e8a6ece2f43a71c400f7ed2311ba9..9e599106e01fb1be78d87877673874f62c2253fd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -70,11 +70,13 @@ gros-63:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4847d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
index 395183c9dee32f445b0d452608fdc8b9e438344f..a921cf96c6e170e2a8ef47aaf122b97b03029d39 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -70,11 +70,13 @@ gros-64:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ede"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
index f1a49311a2e701f82eeea01c09104d77ce9e27cb..1451e1e0715b863efba599624ddf615ecab1b211 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -70,11 +70,13 @@ gros-65:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49332"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
index 5bbbc92fb8763e0949f98184f07b26e90bd40217..3454dbf8844eb30004288fb8a7c158c81f2c1ed5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -70,11 +70,13 @@ gros-66:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492ff"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
index 6e0d224c525269aa87f20963a473293968e0360f..ffeb0cc8d977c548ad987cf2912b72709c86ee88 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -70,11 +70,13 @@ gros-67:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49314"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
index 68fb322e0a4d719c89943e6f77d73c3b4cb9fdbe..85c40d30dc625efb952a938e6d2c296b6927615d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -70,11 +70,13 @@ gros-68:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e41522c8439"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: XCV1DL67
       model: SSDSC2KG960G8R
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
index e35d1cb4cd6ca8b89f364b92bc9d44a8cea3e195..c9ca7da5b8d16454e08222c6d954fe9bc6ce8db8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -70,11 +70,13 @@ gros-69:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48472"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
index 0223705899f955ed2589fc76e810063526063e2a..3b38607d3e0741360598f605e1a6fe341f9845b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -70,11 +70,13 @@ gros-7:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504a75"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
index 9de7807146d95757cccca120a3718bb7267913bf..e18f0da0e30de60edd3ea57d5857c051795685e1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -70,11 +70,13 @@ gros-70:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48539"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
index baa3d7ae02d1070a0bdf0b9fabfbd564be27d34a..1c340e3f090cc945dca4b203ab4ce6452c43cd45 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -70,11 +70,13 @@ gros-71:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483ad"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
index 7252732766bb3d8d91ab78b7f91863cd404a6145..b1158c6eaca1b6cb9a8d459a6f83b74ff1c62240 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -70,11 +70,13 @@ gros-72:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
index 32dcba32b9bbf906154f05af9ae760818b0dd406..a1e20a9d1b2a3cae4066e1914152ac4b133da402 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -70,11 +70,13 @@ gros-73:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f82"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
index 98ad9f20f6628883923015cfecd280f565706a45..8a33d44d381c082a17e1086c0a9f1ad749d5d701 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -70,11 +70,13 @@ gros-74:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f40"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
index 4d0588de62ef40ac43a08fb6df9bcbd9612d8408..68a2deb88f341dccaff5aee0c8ba13eaea4a6d71 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -70,11 +70,13 @@ gros-75:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4925d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
index e5d605743f7a91135af46a8f6524532c824e515a..face66d6716c0e96b3f31c3325c86439b782400d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -70,11 +70,13 @@ gros-76:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49116"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
index 530783a6ad0cc87dc0479d8796ea47cc816a0f29..2d61aa424ab063871beea35e07453b0ae3e540f4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -70,11 +70,13 @@ gros-77:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509944"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
index fd4eeba57f5c4623b5eee38209d7bf8ffa6c3597..9e429387d5df792a5e06e3e38982dbd5f76dc461 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -70,11 +70,13 @@ gros-78:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509956"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
index 21835d97f04dfda11932aa934963399b367df486..e9614e31b4ebc7ea4e22a1aa9f557ed5a4791897 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -70,11 +70,13 @@ gros-79:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150991a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
index fc6e30e97f079024c40489e97df7a7af98649045..ded70a30aeea7937230abd7ffbf10d00ee04c0a2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -70,11 +70,13 @@ gros-8:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4929c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
index d0de0a9f90389d9c616b3b8c53024b05089e8a02..dac593529e0105f438ea99de878ee867093265a4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -70,11 +70,13 @@ gros-80:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
index 04ba45a2c03a594b979fa677e554256ffeddf113..315c88e1576edcdbcb0e7c623c65df9df6552b5f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -70,11 +70,13 @@ gros-81:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b74"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
index f62c3aadc8ca25e92e88ae19f98a65c2dd5b42d9..ae2e17514599e8c03e92249be3d77fca34aa4406 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -70,11 +70,13 @@ gros-82:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509957"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
index 5d9c86f310d694a05a324d89e437e44cd271532c..b4db5cd2d3ed7377f88fec26ec1fcb135030e9ee 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -70,11 +70,13 @@ gros-83:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
index 7eebba10819b7d484e50d24c260bc53426bf5e0a..aedcfa645ba490670f2e8f90457f57d585684399 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -70,11 +70,13 @@ gros-84:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
index 14f1694962244c13af62a991f14d976c65d1adf0..ff2dc427f6726e672a3ffb07bfe671b198f9a659 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -70,11 +70,13 @@ gros-85:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48820"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
index 0f2d0d9a22e74d9c5e20988e55da64d392445cc6..0e802ffee763a0f3b1c5008e508a584b2530c905 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -70,11 +70,13 @@ gros-86:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a0a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
index e7e0ee00a108cddccb757e24da9c865cedbc40b3..adc7e71d82e03fdf7bc104bfc90222f3d2ad4f56 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -70,11 +70,13 @@ gros-87:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad22"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
index 7b00f49889b0068bb0bb4ff251a50308248c99a1..9f6551be77d1109e700c72c22afd629585270d94 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -70,11 +70,13 @@ gros-88:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad36"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
index 48451b6613ae6748ce7da3a4575cddd59550383d..cde0069d82bcbdc99ed7f5ae265a30ed8d1c2060 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -70,11 +70,13 @@ gros-89:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f88"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
index 2fb9fd2272d8ad8dfd33ad69f502962a000de02b..5fb17cc91ae48b0e7c8a904b80c286416502171b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -70,11 +70,13 @@ gros-9:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483dc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
index d7eb0cf8421591e198e57fababe09811dc69250c..c216a669db59522df28ba0a3f792ffbbc2eb812f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -70,11 +70,13 @@ gros-90:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47ecf"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
index f1e04db4f5609a131fafed98326d9f0e6068fe3c..cafd8e51337950ed1d212e77f3f87931b351b3ac 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -70,11 +70,13 @@ gros-91:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
index 54eeb1b6ffab61b1ac55c581288cb3d5f1b49813..5f9051f30dcecaed2e51508e822aa2c9775cdd41 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -70,11 +70,13 @@ gros-92:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f71"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
index db03f5f30c28bab9239341ac0c47d7d213749a07..ca474d2deb223c0f7150fcf4389efee950484f77 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -70,11 +70,13 @@ gros-93:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48edd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
index fc540e43552d80f210d9cfafcd469d5c2027dc62..5165573cde8752405d5f1367786f5ddfd55f52a3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -70,11 +70,13 @@ gros-94:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150344f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
index 8d1a08fd87fe47d90470eba518392bcc98ac2b6d..c171425ae48166df56c0a64aefd06eded8015686 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -70,11 +70,13 @@ gros-95:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482f8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
index 27f4265cce624643dab435768ac61a98ee800d4e..4e8c16835e6e899839c05679ece5ad271458ec2d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -70,11 +70,13 @@ gros-96:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47e92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
index 5e2d7cf184fd1b9eee58f43c360dbced1a4dad06..81851b27e4b95312e0657e4acad119e04be73997 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -70,11 +70,13 @@ gros-97:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
index 93c77b32020381b6305b1cded6e46761fd3f020b..f1c5eef3c08bbb65ebda1d117e89f95067a47004 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -70,11 +70,13 @@ gros-98:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150407c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
index 0d246a8dc83e9cd10baa0c2872f50eccd47ba98d..01a8c855af0298f3b6526a1d1cbf95a9ccfc0956 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -70,11 +70,13 @@ gros-99:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4823a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
index 5be690ffea2473e0d7a8faf24cc55fbfbd98ce33..bc3333d0a0d9da42d6163c137edf793c5e48f811 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
@@ -41,7 +41,5 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
index 27c3761e7a46dc7016d18d24d01686f26ba6dca1..1ce8b7e9024128d3af5eece303c177090edf73d7 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -104,11 +104,13 @@ grouille-1:
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: D3DJ004
       model: MTFDDAK960TDT
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
index 21b0d69372111f2e8b0cbee13165fa8f3763b969..8d5042421c41320cc389b44b76a8e5ec57334195 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -104,11 +104,13 @@ grouille-2:
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: D3DJ004
       model: MTFDDAK960TDT
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
index 94f3c031b3f158b021981d317befd728d2465f1c..3972aa6ced9d0a7c1165edaf1f445dee87787784 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -40,7 +40,6 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
     gpu_devices:
       nvidia0:
         cores_affinity: 0 16 8 24 4 20 12 28
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
index 0f99419cf33d3fec381d7ae41e4fd8fec5a73e4b..4efb609bac58f0b93044b85118c5ab071e2ab6b9 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -120,5 +120,6 @@ grue-1:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
index 1109c245a58261e692b006880026a404b4824bab..305b1ea6092dcd505d245a7aaacf6b42b24bcaaa 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -120,5 +120,6 @@ grue-2:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
index bb301bacec2fdec750838e4c9a346386f2636e2d..40e17198b8855c9765353968d3886bf064290d31 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -120,5 +120,6 @@ grue-3:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
index 7d2f9387517d88b4b04d0922afd5dd56268cbae8..0c48d28234b2605369229d9086216cfa601d25f9 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -120,5 +120,6 @@ grue-4:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
index c2d3f5f205c07e0a5772a081f87a466fca9a0a1a..a6153f11a5b3a32a875c0eabfa8c18102e39bcf5 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -120,5 +120,6 @@ grue-5:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
index 3bbb56712e6f294849d579794d338083b5bd9975..e7dccbaf9af147f0b68ef286e7c0a808b9a8453b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
@@ -38,7 +38,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     monitoring:
       wattmeter: shared
       metric: power
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
index e6d532bfe01fb911eb7361f4e0bdea35c00a1577..2d5ed0ad361a24b179f4eea199ea00b33759b868 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -81,5 +81,6 @@ grvingt-1:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
index 6995ca5f7a4d60f1d4bf6466e5a0b828d4730ac6..2d62935fc02eaca5bb06d8e8a0e26fce5aa4a900 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -81,5 +81,6 @@ grvingt-10:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
index d554e104e191e70bb82a901f3587dc886ba921b7..167c8b9acaae56540c4b60ef989863dd8f3db05e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -81,5 +81,6 @@ grvingt-11:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
index 4607b3caebe48778db812f746fcc846988e7e860..b274acac7a64042f0b42c26962ee7570805329b1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -81,5 +81,6 @@ grvingt-12:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
index aed793ad7c7221ca68f40bcdcdc68579d6a18235..b8266a130b37cc4505c669e0cb88640b3aa459e2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -81,5 +81,6 @@ grvingt-13:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
index 86cb85ec65130c1b171f88725dd95e4cd864f337..b45f77c09ad96428cd127690d70f4304389f71ec 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -81,5 +81,6 @@ grvingt-14:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
index 9501527eda43d0581b4ed22aa602c4a3b0cccea4..cb00b36fa9633a786c1f740db2fa23990a378d9c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -81,5 +81,6 @@ grvingt-15:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
index 0e8af7e82ac9354035d5c1d17124cc6cbe8bd05a..a2712226c5bd74ff7a3d4597c5f697bbbe788e94 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -81,5 +81,6 @@ grvingt-16:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
index dbcbb462ed28a8f21c140be06725c9aec5e4c34c..c9b0ff45e99dbc8bbc3fabf643373c3f6474e05d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -81,5 +81,6 @@ grvingt-17:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
index 8877dbeef1329da14ec681dc6b5a03614d4fd3ba..f497187c6a655962af98789ae797f3623e7b88fb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -81,5 +81,6 @@ grvingt-18:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
index f56720be71664077b1dae71b6fed3f2923ec2e61..4281a30a847f78bbf34ace533cb9628a99cb0368 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -81,5 +81,6 @@ grvingt-19:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
index ebcc12b5b320bf20a08cd0f4743e537c28ec45b3..c020b48a0c8f6d573e85c1d23d1c69894401399d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -81,5 +81,6 @@ grvingt-2:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
index 22aac45aeb96198877c660c54f5ef16a2e33a21d..165e0a801f2bf6b4cd23bc373720648f541eab52 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -81,5 +81,6 @@ grvingt-20:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
index 3c5b5a12dc786a5e38db2cfd7394b33771903744..f6c9ea5965337ac975d3361fcfa3898bb75bde81 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -81,5 +81,6 @@ grvingt-21:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
index a54ddecce3e167d80802f6d14374f43231b3bf13..8e9280310af4cd1f4ed9a38eb5dbece9886b2a88 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -81,5 +81,6 @@ grvingt-22:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
index ccd61b8b041e8b1e495ad736b6c0ad736eda3d99..fcdfb379db8b336d2282791e7c66941ce1013c6c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -81,5 +81,6 @@ grvingt-23:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
index 6f455adc06b0a2ce853e53e9db66dfbd10461582..4f4a88692e8e4dea1064fcee2d16ea1bd40897a3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -81,5 +81,6 @@ grvingt-24:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
index 63ba9e610ce537aca045f63e55f4432b3730c16f..ee7bdddaaa07d663523638d52bda4c5ad8990d39 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -81,5 +81,6 @@ grvingt-25:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
index dbc1b68f79c385cfe76c35295d5610ab504ccef5..44961e44dcdd0e39171235ae4b8546a4ef7dad57 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -81,5 +81,6 @@ grvingt-26:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
index e761298a0525b14bbd186722d41ed96c8232d638..d398775ae20fe9c0f7d0c98e68bbb74aa18ade57 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -81,5 +81,6 @@ grvingt-27:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
index 29c21ce546be7982e74223d24f6701d5fdbc3b00..f883bc0cac25b38f952227a03992a7f950017abc 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -81,5 +81,6 @@ grvingt-28:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
index ef27921586da49d963474ecedd333963b3b078e5..95157648ea5bd0a5db9ddd5a20b0ab5865d15b9a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -81,5 +81,6 @@ grvingt-29:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
index 5ab4db0dc064619e07fedc5aff0da94056a3e6cf..7cfe507a554041108e0b5ac9922ca3803770ccd7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -81,5 +81,6 @@ grvingt-3:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
index 6dd781afc0acadf7fd36ce4f291a06be1028b1e2..1c1d33fdf0bb83532b8a9166f2390227bed7ad1f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -81,5 +81,6 @@ grvingt-30:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
index 8f8d3cc3a4f66237f227483b3a5296bd859d6583..658968c24c145bba5ae40299750f7e99e7c5d5f2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -81,5 +81,6 @@ grvingt-31:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
index a07814fbbced74574512b7a2f8728dd3bf488898..5c507a48ed7fcbea93523758582958d0411ce44e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -81,5 +81,6 @@ grvingt-32:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
index cc7954d3e9f712e299e3d6ef4e31a4b8396c8f26..10ec0311ccde9feece5747788008058a8cd56f8a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -81,5 +81,6 @@ grvingt-33:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
index d34b628b663203a6db5dbd385dc5e3851b2d6aca..e2c11b1f64b8cb5f99f920b4ad866ac99aad3202 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -81,5 +81,6 @@ grvingt-34:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
index 52f67b7e273dc33f872103dee44aa447b3f2549b..28878f3c0d52ed80e0479eace886504e4a5baa7c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -81,5 +81,6 @@ grvingt-35:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
index cfee583dc1c0d3363a3b34fafcfb976182bf7afe..4cf8a4573e36247feb7df624b3f1006f141a1b6c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -81,5 +81,6 @@ grvingt-36:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
index 425f989652a76423877be9141d323f1d0b8d38fc..64eeb46114fc82a1ab5e5262a4b0e60cbcfaa63e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -81,5 +81,6 @@ grvingt-37:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
index 9d6cd410a467c1ecb0f1a9ba327a8299b27886f9..e1c1668de84a6aa361561c2a9e75cfab7a689aac 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -81,5 +81,6 @@ grvingt-38:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
index 7c4aad18a8ae66fe1349126191bdc9b4cb74107f..4d3aad5ef1bb3114b42f6155cd48036c5e4f612e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -81,5 +81,6 @@ grvingt-39:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
index eb4e24cd32f21f1395702616df21f1c59657baa1..4e788321c120ef8ccfb3d16df1a577a8dd54e727 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -81,5 +81,6 @@ grvingt-4:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
index ea3c0dcbd5c814945e955377209787149e9e472f..4939c4c99c269d503c4a32e540dd910b531b7dda 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -81,5 +81,6 @@ grvingt-40:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
index 2e4758272fb0d6534ca064eb52951edefac42f3d..ed6878a7eab606ad7961c2b568b1a365b29267f2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -81,5 +81,6 @@ grvingt-41:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
index 17a75d63aec243f4b14218b1bde03185434c01a6..e2cbcdef477a5255aca89bfc7c263ff625780ee1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -81,5 +81,6 @@ grvingt-42:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
index e730d2f0dfcaf64a3f6fc53481a02db6b91d8648..f9158ecdc9db951ee00555898beef3f241cfe643 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -81,5 +81,6 @@ grvingt-43:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
index 1d370be1583b35df8bc87a78902a67b0665e4544..105afb6b4ab92024aee3f9f51b93d802d77dec54 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -81,5 +81,6 @@ grvingt-44:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
index fe917aa75cee4c03289dfb1c61607a1798d6b58a..c2475f7633a9d72ccc7a70e45b6d658d2c1d52d4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -81,5 +81,6 @@ grvingt-45:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
index e6ede54350c715e03ba5d9f382b101ad4375731f..749e4b837522d0bdb900a943c75803dc2624212b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -81,5 +81,6 @@ grvingt-46:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
index 9afefde39ef82a1c956fb24e289cb4c124f50af1..7a2e1778b1e1f35fdb4502781639cbc64aaeef52 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -81,5 +81,6 @@ grvingt-47:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
index 5707b8fcde6062ccbee0c2f48f742adc06594963..e49f0d7ff04389d2ffe046ca36549a20ac1be1f7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -81,5 +81,6 @@ grvingt-48:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
index 7e0f69fd93f9bd0e30aced92a499826c58f6c276..c22e54e28df3908694a902c8b02b200230f4224a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -81,5 +81,6 @@ grvingt-49:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
index daef059b35ec9f41fa62000af036ed99d347de0b..e9ac11232f0907376d7fac4f43d58121019e92b9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -81,5 +81,6 @@ grvingt-5:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
index 57c6ffcd3bca4ee790b7ecbbf81d7a34c7c15005..3fc847c81112645b3cde6e1f218a11eb816c3b92 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -81,5 +81,6 @@ grvingt-50:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
index 9bd1d4e21680991249b52ffdc299d185638815a1..d4cb84e6ea182f2832edf71b32bd8268b3c76336 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -81,5 +81,6 @@ grvingt-51:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
index 6ca8232ea0aaf2cd37bbab742b41760a2a0682c4..f62eb2ad24c54bd1b5ae693c90d5d8ba2e5955a7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -81,5 +81,6 @@ grvingt-52:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
index 0555dc5a209d7bf66fc754cfe74efbbcd9bbcdf9..5669c94f92a73571f0e17693f4a29837c56dc1c2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -81,5 +81,6 @@ grvingt-53:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
index 56af211a86df0ae82bf818a15a53c697ae217228..4c32742ef9ab0c9cd98f3ba75cced31bfd8d6c17 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -81,5 +81,6 @@ grvingt-54:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
index 526883543a895cad3ecab929e9a88c2e1c352595..295f4eac95cddd4ee777c1e8123b17a855df99b2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -81,5 +81,6 @@ grvingt-55:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
index d8ca66bc36fca6e24bedae399644db33feb4a218..08411592d5f92c7e3ced4ef7061072abb11a70ab 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -81,5 +81,6 @@ grvingt-56:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
index 3fe8ac2fbd6e72338af15f263ef920cff90a299f..9f7862160d6b74b0bc5dd6eed7d371acf912cf9c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -81,5 +81,6 @@ grvingt-57:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
index 2b82f6dac9c7d1858c57a94da0734c5b63149771..d737b1e08378a3a407c412bd296c8b561d281ed5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -81,5 +81,6 @@ grvingt-58:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
index be2e6ae7e947164d9af0241ba3b03bc88375ce7a..49b1b58827e65878736c357df36ab8bfe9d198a8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -81,5 +81,6 @@ grvingt-59:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
index ac71f7ce83ce41d3135ee36b42ef471bf5916dd4..4a208c2cf6df5bb23cb227551d0cf45e6a7daf6b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -81,5 +81,6 @@ grvingt-6:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
index d32279fd8e9f9c10ab6fa3aa286232ea4ebe8ecd..76ed64ef5be2d7110ee1a3d255364106ded1e555 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -81,5 +81,6 @@ grvingt-60:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
index 6da51c21e3951b69729213770e7b8fe4aa3d5fb8..901ba6544872b37162da0a363c410a9da7fb978e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -81,5 +81,6 @@ grvingt-61:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
index c014f1fc0669ff48a51159946f94f8caae846374..6c64376fb1feb14734d6e2ac1fadeff9bed8fc60 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -81,5 +81,6 @@ grvingt-62:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
index 81a4dbaa9e75ac4babe70a39b181593b851a2f1d..c6782714bb7284312dec65218ebfab50d9600945 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -81,5 +81,6 @@ grvingt-63:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
index 8cc1425730fad3e22e941c937978b448c664f536..62795814bf8a94d263adce00b004ec6bcdd725a1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -81,5 +81,6 @@ grvingt-64:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
index 3776c54a31e9604623e06167437e40d65bbdc433..8112539be2416785fcb792ef72a3dac26f76f19f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -81,5 +81,6 @@ grvingt-7:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
index da939c8546b85a732951a1e81f7c9909bb05c135..1beff8b2ff64626da09b7a70b64fa4b3bea7317c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -81,5 +81,6 @@ grvingt-8:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
index 61473029f5b1e26432d600f1a291f81ebe2986a6..b3bb12f3d5d4c36d5f4e74d7b5dea533c3b3a6aa 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -81,5 +81,6 @@ grvingt-9:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 428dc66aef883adc4700d257c17f7491edb39de7..13a6f30711864b49b4c4a3caf2d392f36895d804 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index de09dd381b2a9b10368eaaef511430c269a9e496..ce7c2a32f89f16c1aaedf426bd39101b5901085e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -87,5 +87,6 @@ econome-1:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index 6f5750b487b11b00f76653d14557e53d89a78fed..9b6c27edd9765299aea91bc3cdb4fc8ff1f75a29 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -87,5 +87,6 @@ econome-10:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 31b54182e7dafb6a9769934c6fafbc574b82aef4..5cdb2f973d471b677770721224f80318c489ca23 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -87,5 +87,6 @@ econome-11:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index d11f62fa9595f38fafd1d1a475c0da6b8348bac1..463540e33bda3cb7df773c992aeee9ba59e8e750 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -87,5 +87,6 @@ econome-12:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index c83f5c85da25a82a4a4af77a47ea0196d838ef6d..fe3c17869acba6cc79ab99b18c02bfed2e0c8d5e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -87,5 +87,6 @@ econome-13:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index f34c627ed81905929bc7f5383fd2372ff1b69741..1d558ebbd0a40734436a9fc8be2f66d3c54dcaf7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -87,5 +87,6 @@ econome-14:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index a16dedbda3ff0e96c0530eee00a20ec861c0e4dd..51ab8065894681e02f29542b63efeb4c44646769 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -88,5 +88,6 @@ econome-15:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 1d7c9516a837b9f06015fc3b1f9ae93af2d622f8..7eeb99c570fe6f8495f4276177360658ec9b7a1f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -87,5 +87,6 @@ econome-16:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 4effec14f1b1d6641109a452841e044f56cc5fa0..464d2dae58aaeca56d2086475147beacba5a0d05 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -87,5 +87,6 @@ econome-17:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index 6fb856337af95a9997e7d8e918ecdd466cb10a02..d932b04aca5c5e91e8bdcbbe1ac506e3dc50b4f6 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -87,5 +87,6 @@ econome-18:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 2d5bf676197774ce207992262e40f2797289159e..6b19f214e41f878e42ab3d05b589870a534e7504 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -87,5 +87,6 @@ econome-19:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index 5c3a634fe94d839cd5f3a7321431e92845dc1aab..b866a28851e9d78dcf03f6fbe698e03b38c985ea 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -87,5 +87,6 @@ econome-2:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index ab838d5883c6d7d4c03dda93e956efc34e6b5f36..196b543b06c249f2993a00fcbf2ff1aede9bded8 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -87,5 +87,6 @@ econome-20:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index fdba8201d647a2e6736af8da53cda28c4b821d2f..6845f71d2003ba5029ee65734a1b4f07f1b29274 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -87,5 +87,6 @@ econome-21:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index 035a00a4e694a581ee1cde16cd5f04c187a7af35..0359dd57d2c667cc0e9062713b9730d6db65db93 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -87,5 +87,6 @@ econome-22:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index b95bcaa4e11f1d5b6c44596f30d8c8d8c03587b5..d21b1ebdf7095e7e51f2040c1d8dbcc0c638656c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -87,5 +87,6 @@ econome-3:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 8a6dbef00417cac9ad7895e1418600842f4b63a0..76f9c809ec5158a5e6c44e2fb06c506e2fa9e94c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -87,5 +87,6 @@ econome-4:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 36ad503ab6c5f54110b5403f59191dfd48b0ecd2..99b7578b736d479bdd6d63a67d965eb95de0237d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -87,5 +87,6 @@ econome-5:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 79eb27d79d3d3cd94da3022f8020dffc00dd1db9..f25cc10ae5e9110bc3de45ae4db16ec7f2cdf5fb 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -87,5 +87,6 @@ econome-6:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 7b5b69cd2c0f800495b6342690b586d8c99d60ae..784ab2d533d2db1b60561489591a144f1e56faab 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -87,5 +87,6 @@ econome-7:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 28679a0214a70b300a62eb99a2e6f70ee6740425..323b2ac811f596558e7ce30b12d5db1ecb3703a7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -87,5 +87,6 @@ econome-8:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index af08860e94847a4d201b85cbadec018347ea346c..520f88c87236119ad045f47340dd5d130208049e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -87,5 +87,6 @@ econome-9:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
index 72f99b75d15651752b2a0acf05bea0860bdbed55..efa238645599690f2f6bca86f8815e41f3b70867 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
@@ -44,4 +44,3 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index 2e4c96e854e4cc670367dec0b82039bff516c5f5..f8beb8700a96553bebbe324a20b9b5fedc421bc0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -88,5 +88,6 @@ ecotype-1:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index af6f1a6226a8af89df5b56144247bcddb637e9f9..b44655b85e931b675c871ff949df1b3fbe5cd83a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -88,5 +88,6 @@ ecotype-10:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index 9b4784e8c2a98c7bce4ec0ca8d87857b06b2be80..0f8cc810a2ec6c4593ca8b45714eb109dc90eb92 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -88,5 +88,6 @@ ecotype-11:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index 2e3629d940b5b75d6b3c0f3310164d4c5956a3b8..e8b3d886ce4d42680c8f32e3b028bcf630785d18 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -88,5 +88,6 @@ ecotype-12:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index c0c92a1be9ebb87dab4287e9c52a716feeb6a986..e719254b59c2f6e45e1ce50b891f9d942c71fb26 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -88,5 +88,6 @@ ecotype-13:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index 23ac5ceeffe72e548416f50fff59c5c443ff4053..97bd7c3e466bf5dbc60a7e369743cfa5baf76203 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -88,5 +88,6 @@ ecotype-14:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index b362080c9c8c43fccf9d7d5f3a1430aa424b0001..b9ec78f17794d807fe42d1a806357118909c5110 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -88,5 +88,6 @@ ecotype-15:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index 6ee55c9d703bd1e394fd29b6baa91761479992a3..97e3ac1e755f5e699a419b16f2340db948da9073 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -88,5 +88,6 @@ ecotype-16:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index e44dfd844ca80a3e13a99f68a3a437466fee7b98..8ebec698ffdf805d52b9653118f9155935ff8307 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -88,5 +88,6 @@ ecotype-17:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index b7648ebce8cf7b3c0970a7ace5c500dbf5d69aa4..81a3035a4a8fd1ea1c2e7ee2975dda15b58ca157 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -88,5 +88,6 @@ ecotype-18:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index dfa733e329a0c01004059ed348dae54631351150..4215a95f552317a7c6021e4648ac79ea62d3fa71 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -88,5 +88,6 @@ ecotype-19:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index 52fc06cef281246050ed3e94b7ee6880a7baee80..d348a169baeea93b1382bc91a155afa805e13f5d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -88,5 +88,6 @@ ecotype-2:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index fdc7266bca090c628d4d78c33541988a30c9961c..c4bcb69b2d50de01ca728b92b22851a3434fecbc 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -88,5 +88,6 @@ ecotype-20:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index 61ba2f4b9bbd6130b7150a6169b1cfda49f6d7b3..3501ab1a31ec9fd844286464f51470672e6ba5bb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -88,5 +88,6 @@ ecotype-21:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index 1fefa7e02c42c8d411d72b3d988c8644e85fce61..2e7d9bb628c0528ef71c3ec36752d731764ca065 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -88,5 +88,6 @@ ecotype-22:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index 7d0208b6ef3015b4bcd01735fec9235272138e33..63adcd821a2fb3862ff252a16be61496eb90fa68 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -88,5 +88,6 @@ ecotype-23:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index dde040fe6a7e122948e5519f1d06d326498bc850..a7073e4364f6956c71c62759a8119623adc13468 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -88,5 +88,6 @@ ecotype-24:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index 7ccca0eaccdb8ef036d77b813320940bc14df206..da6a7b6b5da38ac0569c92fda91b8824f58f43a7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -88,5 +88,6 @@ ecotype-25:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index 85a682322a803fe084fe3226cab4eda39cc4b22b..be6f1ce3e188f0c941987b123e4be19edd844365 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -88,5 +88,6 @@ ecotype-26:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index caae84a25570a1059ed79c0f49d44dbfba8a7598..a5186a9c73df170d2000aa482ae6ea41a3056222 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -88,5 +88,6 @@ ecotype-27:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index c64654ecbfe2291227a1c305352cf414a9ce33f4..4a0c609aeea641b487e3a1d557667dc24d9c6811 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -88,5 +88,6 @@ ecotype-28:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index bd2bc694a83eea20e2643add19f83aedca287076..2a642b18004e5d3f31eca6c83cf39e623203bc82 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -88,5 +88,6 @@ ecotype-29:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index 5fec4e12d4dc59e4b6bf91dc75c006da4fa8933f..66248d728d171dda228a1df6280a9096a5ec4f83 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -88,5 +88,6 @@ ecotype-3:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 4c7d9054cc6e398102203904fd0e9d5d93cd9f83..bf1437976df07502817d204bf52dff2f74b46e22 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -88,5 +88,6 @@ ecotype-30:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index f2e55e696bde0f24126855ac0410b835cf1e6307..28d6eb842a1cd35ea06f93764f55bebde3291f15 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -88,5 +88,6 @@ ecotype-31:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index 012849f24ef3e2fd0fe0f18dfb7e17d21e7f37ae..41d355937cb720ac028b0d577371c2a2fed90005 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -88,5 +88,6 @@ ecotype-32:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index a301a016685236fc40a8426992bc4134e810b2f1..ed2514e9a0cfb25bdcbb46768898b8b946ff5901 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -88,5 +88,6 @@ ecotype-33:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index b808fb4ca27f25710ced73a0ef8c6f7f484cfe8d..3384a4ede03115353743f5489561b127bb0dc686 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -88,5 +88,6 @@ ecotype-34:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index 2240f3cb941f76506756c8c67b97250b08d4a235..2cfdd0d00ac6a3a227fa996f4b17142e0945b4cd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -88,5 +88,6 @@ ecotype-35:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 5586d4adea128fdcf3d24cfcc6b9be5534769c72..8e5433734c91caf87416e6a2d5a31bd9a2ce966f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -88,5 +88,6 @@ ecotype-36:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index ce897ba363d4733ef69178b2711b67658f9466c9..6d89d30baafc4d3a59e4d261abfdf15b3b9b8a93 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -88,5 +88,6 @@ ecotype-37:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index f634c0ecfab8224ac9fe1c5f77a1e16df469a7c5..bd5d0bb36974ccc758908c90e0a3e91afdd24cdb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -88,5 +88,6 @@ ecotype-38:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index 8741e1d40ef41d36a0bdda8736857d6ab4d2a879..dac9444d2a1d50017ba56769254184944dfaebd9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -88,5 +88,6 @@ ecotype-39:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index d01ef8fe66f32df1a627a52f9b07313641b48097..5fd71aa0fe2ce554c5cf576ded12e71f44f3587e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -88,5 +88,6 @@ ecotype-4:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index 105f25129552749f94f200790f12ca6771db268b..bb739664198904bfb8a8a047319df8f096d87d9c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -88,5 +88,6 @@ ecotype-40:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index e28ee4e95dfe120b7aa36f4330e9d8ed5165d1f5..181eaca073f897b398289dba14941180b1a0d257 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -88,5 +88,6 @@ ecotype-41:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 386fa89d3b23e5686f1883379530c2b722c97598..8e1d274859446a90ea0c2c4ae9443ef3e92637a0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -88,5 +88,6 @@ ecotype-42:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 5f1d7850508853076a1936a29cbaf5ed9dd3da7e..5b8734bd3d0174a068b5a8d57457cbb7ffd3d825 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -88,5 +88,6 @@ ecotype-43:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 755603c194ea45a87ef5aee25646c4acf35e5366..851c66406307b72e78e883f7cf90659c8e47917e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -88,5 +88,6 @@ ecotype-44:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index 4493902eedd8abbd02699794c3830df82faee59d..0855df5837b6d2d993a43bd44dca9cca00a893f6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -88,5 +88,6 @@ ecotype-45:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index 3d1ee4d9c3fac382f0ca204fd1259d7aa28f9bb8..6a0ac13f3cc6744fac2c9c0069c52192ea7e6416 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -88,5 +88,6 @@ ecotype-46:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 41362ddf0b85381662ea4a8b22e06ec79ebf5a91..b28d4bf4909692a5a3c31978e709b699406e09bd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -88,5 +88,6 @@ ecotype-47:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index 42c9874f243051317ae4a21508d1ff719b5b2bcb..4fb8518bba671299c6068eebccea9607ce6cc628 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -88,5 +88,6 @@ ecotype-48:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index e68c73e53957e6e1161d343022bd81bfe775abfd..fa58033e116c4fb7ae74c65cfb27a6e9eba3ac7a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -88,5 +88,6 @@ ecotype-5:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index f377451c93957fa652cabac239037436892c0425..26663729a2be28f98692cc40afecb612c286894a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -88,5 +88,6 @@ ecotype-6:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index e9d1d662255ddf1742c8a7f3fc573931b81f773f..c5e6826a5af14fbc504f743e5ac0fb634d953587 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -88,5 +88,6 @@ ecotype-7:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 6b588baa7d0ea1c98cd0a196bb7b24f08606e25c..f0b717d953e0e3522404c78a544b56d4465ff8a1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -88,5 +88,6 @@ ecotype-8:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index b115d242e06c8d38bd9bcee3e9733b0b609d3450..fe59f0c2d97ac0781271d47d3a231ac019eefd80 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -88,5 +88,6 @@ ecotype-9:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 4ff58487249d8c2a863918b6d4dcc56ea24c91a6..b30c8c73da3abdfc5933b2164bbc0a6e7e926f08 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -89,29 +89,34 @@ paranoia-1:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df100c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0970"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288cdc8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e114"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index 6603b97a136a198ad9d18e1129dde1d9cff0556d..3bbc43b170680b7fa586706277c1013e681e5fd8 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -89,29 +89,34 @@ paranoia-2:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0b5c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c03ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df128c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0d98"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 8b47d26a442cb4e216fe3c58a67735e01a95fa8c..fb1c60fd8f43fb15f22982f1ae9795138de0397b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -89,29 +89,34 @@ paranoia-3:
       firmware_version: D1P3
       model: WD6002BKTG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d35c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e3b8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0c30"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0804"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 4c88ead90f8d9b28d44e2c4fc4440ab10ea4baf8..e7a2603ec003f67c421eefc0a07bccfaa0cf2c1c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -89,29 +89,34 @@ paranoia-4:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be9ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0289bfa0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022cebec"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50014ee7003f5cd0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1P3
       model: WD6002BKTG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index d26b8c520f7cca280b09e2b571052b83ddd1603c..9ff1178bcaaf3d8e77694dced85ba37fe094e78b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -89,29 +89,34 @@ paranoia-5:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bfda0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed90"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed1c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be3e0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index a52f15044fccbe6b80eb3b8c3c0fff20dba4af31..01c155451333e717a136d6d4a9d10298421ad28c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -89,29 +89,34 @@ paranoia-6:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a74"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e394"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df09a0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02ded270"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index a7cb03f2f5215440e99f5b670b3c920c66afdc90..899daae7b85f2008e482ce29bfdb7f0f13797e35 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -89,29 +89,34 @@ paranoia-7:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288c72c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02def9dc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02dee7bc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df07a4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index 3666dcb5e466d01331ac1c8b7f164af0097370c5..a5d66c554b9fc0dfb3323c3e151d981f42cb7eb1 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -89,29 +89,34 @@ paranoia-8:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d158"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e160"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df076c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df06e8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index a6e5a5c24ff392a75214b33cfe0042e4cb3f2d90..0f7accc9d7b1ecfbe6b3a07bcdcc04f8e1212dde 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -20,27 +20,22 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk0
       sdb:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk1
       sdc:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk2
       sdd:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk3
       sde:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk4
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 21cfa0a93f62b904635c199bde3b99cf7311f4af..a6a0bec06651885211bd16a63ea9e9f49059362a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -92,5 +92,6 @@ parapide-1:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index 103926cb5e3f693855d465be163bd3a079201ac4..438de1931d47429b5b8ed284fc4a9efba14efb8d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -92,5 +92,6 @@ parapide-10:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 55c2f38bf147074ea7566c4e11ae8ae23d2eb5a2..a190fc8aec53d2ec81bb3fb4c6b2db3ff23ac00a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -92,5 +92,6 @@ parapide-12:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index b410ebd2c9eb17151ce7ab1afe65d1a1bdd27620..e3b41951c1b66e197eef65c6771cdf17a7e6dd6d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -92,5 +92,6 @@ parapide-13:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index 25660c789b8fb403a3a801d7981fe6d597c91845..65da0287124c6981626f134a0bcc3ebf69a17995 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -92,5 +92,6 @@ parapide-16:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index ebfdcce838a2d4c40bb87c8548ed77ac50201386..211f487e1392d3078d3ec93e4830854aabda5abe 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -92,5 +92,6 @@ parapide-18:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index 4eb613c143635ad843de9095a87ff8ebfe2321c6..c6c008639bedbbadb481bb2544c86ddf62bd35f9 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -92,5 +92,6 @@ parapide-19:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 1b372ff3d06f8799a2fff5d38cc388e49a76a088..34849bab1a8f8487a1940444ce564f0955075b55 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -92,5 +92,6 @@ parapide-2:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index 92ed16235b991d3be72e71c78f8eb00542809590..b4a1c9483e7815f8906bc4eaec28999bd337d493 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -92,5 +92,6 @@ parapide-21:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index c60d9b7f6059789775a598e0368945e0d3d3586d..44d3f3c8434b726a0c0824520b41ffe2f51520b1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -92,5 +92,6 @@ parapide-24:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index 1776dbea16def5f9cb93fec824ed94d18b96ecde..0704bd7a27b633bade4f1a79bf1b0f3c1ab3b284 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -92,5 +92,6 @@ parapide-25:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 843e5d8f4e735287bf47e97178532030b3cbcefb..343a639f40a1d0bea0315f7912bd941c64f41449 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -92,5 +92,6 @@ parapide-3:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index 691e9511307e89e823917855bf8da723475c1aeb..ea3a320c5b7fe6167caa935aaa86e1799f8f53ea 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -92,5 +92,6 @@ parapide-5:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index c97a975e4c3c744f81a3fab1b14b9b4e6d71cac1..624f2f6ff8aaff2679912b1fcafb2bc262d9ae1c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -92,5 +92,6 @@ parapide-6:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index 5be24608b62935e6b278edd00901d0c140e88b2f..291be8c3c6c7d2496760b3e0a574cae11c64b7bd 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -92,5 +92,6 @@ parapide-7:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index bad199c3ecc438909c73cb4a0371963151c6983e..fb8b853ca9500478c8cf621d4192b06cdf164376 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -92,5 +92,6 @@ parapide-8:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index 0bcedb12cc15b9680f6831463b92d2c28775cf1e..44aef8ba1031a2cfdaadb43b712248553178a5d0 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -92,5 +92,6 @@ parapide-9:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index e777205df7d782b50bb821966c67130d7301d68a..9f2ea906fa3218520c22619df1eb97cae84f0712 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -36,7 +36,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index 7808c2c2204ec3115bf9e6b9ddc3f95ae1943097..739ed1a6580e06cbfdfa28ed47a64c9f45b7336a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -111,5 +111,6 @@ parapluie-1:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index d9f34b70ec4285c73677bde709f0527eae59864e..70dd690c3a8f3cd3874b7151173231a55aa0f803 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -111,5 +111,6 @@ parapluie-11:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 4c02998e85a5c36c835bc4d9671dc1f485d84134..b0a4e7ec61a36f67a88709fcb41b8e2b7f4540dd 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -111,5 +111,6 @@ parapluie-12:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index 6afeb6ea73f871626bd3345de9bb6c28764f9d73..b3ff20df82e55bbebd9c8dc2ebf7d99a852b2d01 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -111,5 +111,6 @@ parapluie-15:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index febb0d07917a40ee9eecca5604cd2d4740e2977c..430fdb4f767339c7cb2f09f905c37458b592c3f8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -111,5 +111,6 @@ parapluie-19:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index d4b664894455744834f47b242b13bae28e4a3348..d6fe40d395618c3b11171abdabef5b4592ba9bf2 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -111,5 +111,6 @@ parapluie-2:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index 95642f5f4672e2b38a19c3dcd85058100eeb2ae8..66f010b13b3e9107795b4da063ac4401deac3fbf 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -111,5 +111,6 @@ parapluie-20:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 59c6eab43ca0f5d381120d51771865b535104878..01d0fb39cb75cb817cfb62f8e9802d2f8626d6b6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -111,5 +111,6 @@ parapluie-21:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 3d03d386fb5735fbe9f4e9344f7f4616f51ce9aa..00b9438effc39cfbce169cc73e2766854c998cf3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -111,5 +111,6 @@ parapluie-22:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index 74aa7886c5656eb4903e9a4feffb57aa54ad1db0..c6544e0e493b7dc5a41713862b7686b13194a457 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -111,5 +111,6 @@ parapluie-25:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 07f5fbb6907d324f56f00df6014eee15736b9a97..ba692c769ad08073dba9fa1c98e9f96538a12c89 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -111,5 +111,6 @@ parapluie-28:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index f44bbc6cd4b5050ab50ceaea072abacab707e6c9..e02f6ba0b55237082b643beaa2546cc3621571d3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -111,5 +111,6 @@ parapluie-31:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index e32fcb7dabb67a94453a3f3fa7a5555d5ca0ab1f..f47ae4be184f965928c0d90f4e015dc3d0ad397d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -111,5 +111,6 @@ parapluie-32:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index 86467af21e8a40b5d6a73d5fd57af41ef33b3c82..ccaa53ebdd840a730da325f14f28cd363f65cda8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -111,5 +111,6 @@ parapluie-35:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 734b0693706fbdd09cb943092c1997aee0bbc27e..a5184119f8ecd0b8c4ef8ee5d5a430a3582ce01e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -111,5 +111,6 @@ parapluie-38:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 6b7ba0c53b72cc159592170c3f2ffdb02cbd7a49..c740ec903840c097fa47a868f6e5414fa6cf2b44 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -111,5 +111,6 @@ parapluie-9:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index 50c873204821370c8241f1d57c0d2e84ef850eae..4223efb03a507ad612419617fc2c16c5499aef59 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index cd6031fc596da932a103ee898d91e8a4f9524165..6c884bb606fd1a71b99767adc90e1d6c09d7d32b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -88,35 +88,41 @@ parasilo-1:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4abf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece7a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0444"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 472cc5b88efb9a820f967b103b702792b6f7b2c6..27f6a985b5b8dd949bd1061ef7d8ccb48bfa6378 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -88,35 +88,41 @@ parasilo-10:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece93b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed38cb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece58b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed39bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0440"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index f69a1c3515e288f54116fb810b2201425b5a5087..1a7f2bcd53eaffd2a7db75f0fa9a6dae28b9e9ee 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -88,35 +88,41 @@ parasilo-11:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed330f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea138f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed25bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4bf7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0434"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index 4e38d2a2d6b6c957d9827cd4231f09b6519893b5..ffa51980ee3699b33f45107556715f8258c3a4ff 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -88,35 +88,41 @@ parasilo-12:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2183"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf31b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4d2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3e5b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0448"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 1a204678f3e91da801ab690c270e3cdb2134d049..ed401c63c3951bae09368388452c2c711e4300db 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -88,35 +88,41 @@ parasilo-13:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5757"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5743"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000399b850bdad"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: EF05
       model: AL15SEB060NY
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0428"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index 173d0e501e68444810f5328be192970701957697..b882062e9af1a0221d2f89a98881fd94d04582d2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -88,35 +88,41 @@ parasilo-14:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6203"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4b47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e10b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0418"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index cd529f9acc6dd964ac7f7f95c26809798cd7b922..30404311235d0c36730fc7a1a7c79792dd70251d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -88,35 +88,41 @@ parasilo-15:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed53b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2987"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5473"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a045c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 4bc914d32188781016205bc00a59d0bf65a7ac1e..db51fc83888dd7bcd6cdd3dee73f529085bf9f06 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -88,35 +88,41 @@ parasilo-16:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c4367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c6c3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c2b63"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f599d83"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003960c8a50d0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index 919b2bcbd6c18d585a6cc4e7cccceac9cdd20233..4f3cfc159de6749abf1565eea009253c3c068c35 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -88,35 +88,41 @@ parasilo-17:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf927"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed58a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0414"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 3ff5d31dec67f565312bf07609f4745f7e40fb9e..f589290636766a109ee772a96f745c230aaed347 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -88,35 +88,41 @@ parasilo-18:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4973"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb850b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea04a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0cc3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0474"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index f49f60242f7549cabae67bf841e2832d28b4daa7..59fd105a6a66b05c027b8d4a400ad7fd7cf08fff 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -88,35 +88,41 @@ parasilo-19:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece23f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed576b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3927"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0410"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index efb1d9113ccb28f2c0e5e4bf732eeb95f7d9a5f8..682d5496d3eb400f4f16cdf7b68f0f3c5e6a630c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -88,35 +88,41 @@ parasilo-2:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4caf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2c57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21c7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f4b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0424"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index f311a657ea11623568ffd35435da9da8cdda16ed..f4cbc7dc75685a409b1eeda92add052a00144e02 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -88,35 +88,41 @@ parasilo-20:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed545f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4dcf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c87"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0488"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index f9aaba28bfe4aafca4adf696c7a4d7d039737de3..cad41d18eec9dc1d2bf7b3901537db5f6b083bb1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -88,35 +88,41 @@ parasilo-21:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5747"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed20e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea1f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed52b3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0454"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 06080726c212d22d20f2b93ae197c9a071a7530f..07a3245b362eb529ec569a91bc3643753155681b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -88,35 +88,41 @@ parasilo-22:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf97b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecec93"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2273"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf603"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0450"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index f9e79fff5a8fa90cc7abb9add28af7d6fc5a03b9..f874a24660ee2d3c01542cc04211ab2ddf58e0bd 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -88,35 +88,41 @@ parasilo-23:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2bff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4937"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea47f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0e53"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a044c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index 3c28131fb878abf1168b55b06de5886863f9459d..a77aa09a6b45e176c5be7180292b50adbbe5376f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -88,35 +88,41 @@ parasilo-24:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6ca7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb93bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7143"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea041f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0460"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 149affb6ed79938701e4179b2e09c78e8d7c4024..45c8f747d12533da225c5fe40222281d83617154 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -88,35 +88,41 @@ parasilo-25:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb964f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5009f30f6bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: VT33
       model: ST600MP0005
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fdff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a27"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0464"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index fd7d180d31f9ef60201fb6cdc1513371ca9d1bc8..775bcca48c029141c1bc8be680ac2067e26b8696 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -88,35 +88,41 @@ parasilo-26:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf353"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5467"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed527b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed511b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a048c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index ee2d47992d595b2608f853d21ff9258c64fca4a0..33b08927b6f030ee7a47979f5fa17f75ba3b5402 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -88,35 +88,41 @@ parasilo-27:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdef7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5573"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed226b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed579b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a06f4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 002598accc3693b825b25cfe520192098194bc99..ed3ae746a3eb37252291e330428e921abe23f99f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -88,35 +88,41 @@ parasilo-28:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5193"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0b1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7053"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4f87"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0468"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index 9e285cd7780019186466fc087b7e3bcca8c36715..c9bf53e4d7241c41c6b1c1419c7d72f7042402a9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -88,35 +88,41 @@ parasilo-3:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b0f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececbb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3d8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0498"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 27bef55336b137beb1cbe07a17832e4f31926170..17b6e99af58b958da3ce16d6742f7134c1590fb3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -88,35 +88,41 @@ parasilo-4:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece5b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4847"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf913"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0490"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 7f374c370b60e92c2208ac359381dd3548d39f0f..40e6772b6a7afbb419b57ea3caf4fc836a7d8349 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -88,35 +88,41 @@ parasilo-5:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5587"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3283"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2eeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3183"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0458"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index 198f134b0905471ccd645de8a6bc80672651ffa3..d45605671d29f470fc75ebab2521332b81a4183e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -88,35 +88,41 @@ parasilo-6:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed570f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed466b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed29a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003973c889ab1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: AM07
       model: PX04SHB020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 6ce471f9421915c5f71e52fb8b8f5a3875f65530..f3ed67db4bee55152a9c58379dd5a22037b74823 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -88,35 +88,41 @@ parasilo-7:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5597"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf0cb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece9f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece66b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0438"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index e7b5eb8650609f21456172492ac3e909c9e01990..9da996231a30df9add539bf6e447d4cf7b8b6920 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -88,35 +88,41 @@ parasilo-8:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafca7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a9b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ca3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed22b3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a043c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 99b7295b8ee256432fdc4c6fc738cc2409c30945..6a06e124d59a2ef55575e7f850d32cc5120d4c3f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -88,35 +88,41 @@ parasilo-9:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2693"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed219b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed30ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb778f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a041c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index ac3702beb704a740a4d0411384b637c8811adc70..c6bd45f09201a65811be4acbfb617783b975677f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -20,26 +20,20 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: SSD
         reservation: true
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index a6c6a96386dc9ce8a1bdded54813a2ab11c880fa..ddc084a1c8dc42a3fe49bc59d72b1d95cb47b25b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -88,11 +88,13 @@ paravance-1:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8577"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index c7d768989e567a95ec22bf70297f03966289c580..fac38eed7673dccc46f14d6de076bade136fd726 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -88,11 +88,13 @@ paravance-10:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f8b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index b158ad42dc5350ab51a0adc767213a887ff921b2..307f62481912e59ac63d7d8838dd88be0b958437 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -88,11 +88,13 @@ paravance-11:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea738f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index df549285cb9b03e1645cb5b56d63cde9b2ffce13..92c5842ff6305a9fd7ef863011fc01db69979b6c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -88,11 +88,13 @@ paravance-12:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafe1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index 71b5f90862616e13966c381a0b828278ebcb57ca..27fd495248874960231d7b549194fc770b44d940 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -88,11 +88,13 @@ paravance-13:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4923"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index be44e23620cf110273e36440bf12f5dfa4211f82..71943608e2130bdb014b481c333c8fcd664eab3e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -88,11 +88,13 @@ paravance-14:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eac923"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index d723f79547e8a5cfb9974d2bbd543e790161230f..64febc3eb081769d583f69ae3d082dcc85349ab5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -88,11 +88,13 @@ paravance-15:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index b9636f6266519195d90428c1a5d18bd991026247..bd3e0a6ef63d45367b10f3ac1c5e071d4069b4ed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -88,11 +88,13 @@ paravance-16:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2687"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index 9aad3d8feeddfa34f6786675c484e3f08c34eeac..b73e1c077b82e26cc07fbfeebb77e59ba17bf245 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -88,11 +88,13 @@ paravance-17:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8893"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index de194876e79f234540ec4964060bbe1fa3b36f06..3e703dbcbd63f65333bf378e85c42866f6f0c4df 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -88,11 +88,13 @@ paravance-18:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb470b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 819b9dff88507f66485256081ac3cfe07bb2de20..032878c28101fd261e631079f2cd6db69ca2ec1f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -88,11 +88,13 @@ paravance-19:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2acf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 0c78c0287006861a6a3ef583545a4d7037c08e52..03ee8db70783d80f6bdb0c03ec1fdc461fc54d73 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -88,11 +88,13 @@ paravance-2:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea29a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index c0810c17a3be7faf245f31f967a8648f0b7dfe3f..257f66f895ff2fadea418115c456bac5754d261a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -88,11 +88,13 @@ paravance-20:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb762f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index 95a7bd6583e69ebbd5dc4776b653af0a1936d292..11465d312c2a84e74687b3a45531a0cb28615b45 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -88,11 +88,13 @@ paravance-21:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e8343bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index e6d76774334255e53d195d59db9e132f25e80b99..33982d46e801d7272557f118bff4a932e2df5dd1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -88,11 +88,13 @@ paravance-22:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d847"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 800ceb20031c5848d647a40c499567c1eba33971..724e39ca533044ed0e30d5a17b1166369291855d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -88,11 +88,13 @@ paravance-23:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5833"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index 254c4aa2a9eaef45ff869d78713819469538afab..9173926e975bb0c1f5f587458567ff320c748a53 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -88,11 +88,13 @@ paravance-24:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a53"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index 7a9e548b896c31bf32401a7209db3639fd236c3f..6d18584933af7104af416e51025347e17b9dd5b5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -88,11 +88,13 @@ paravance-25:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf5fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index c44cbc6311546ad2a3967148f9dd751d642efb6b..f862f1883077b2cb308bdf8025730e9e521751c8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -88,11 +88,13 @@ paravance-26:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed57cf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index 339b4e34f69567b7c1cc955206fc1124d45defa4..241fa35a34d3ca36c7618b7401c72662a696df15 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -88,11 +88,13 @@ paravance-27:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb577b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index fbdb067fa51d1ec3c885fd18387fa35d2420de83..54215383a8cde8535261a77efc28bf59e9ed5135 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -88,11 +88,13 @@ paravance-28:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a83"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index af703df8a410ebc27455c53eca5c2ebfb86fb197..696c6240660e2eddba2de0b4c40bf3f1cd147185 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -88,11 +88,13 @@ paravance-29:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5703"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index 4798b56398b2e779ff8aaea9e2c54045b65027e8..1b00c29aa364bc630f6c0184560d1f1872a934f9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -88,11 +88,13 @@ paravance-3:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7233"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index b82dc83a6261c988892686f0b35b3c56a7352cd8..af32a6d611ce80ef58e167e7f64a1196993532d7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -88,11 +88,13 @@ paravance-30:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8ee3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 85fc7aa87d7fa0645438489396468c3156000e24..5ce55b206699ecde35f878fba4de7c12cd0cfa5d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -88,11 +88,13 @@ paravance-31:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb25a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 282a2e3ee124c3ca1a9ac4987289dbb6a088d7fd..aced33aac48fc3bd2862fe40a38aa68049b51b62 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -88,11 +88,13 @@ paravance-32:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea1343"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index ab617372b250cd22741bf179504fd68152836aa5..9c5838d387fbec30c91b44c35f01c098b23906f2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -88,11 +88,13 @@ paravance-33:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ac3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index da56367081b1e8938130726199c4e2ed9d786ae9..42d3c3dd9b5d076412389d41f5b587e48d386f59 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -88,11 +88,13 @@ paravance-34:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea85f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index fc1e086938cfc8e2de090d28ff64c8b6555090a2..d486267d119c9fb8a9bf4849128f293edfe1db98 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -88,11 +88,13 @@ paravance-35:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54e3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index 91cb94bce9019e999e9a302bfadeca9df1e16576..edec03053be8e0eacca9da958e4e2f50acdc922e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -88,11 +88,13 @@ paravance-36:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3047"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index 6819264e3c29837b15ef6611e3ea3e350a3b7946..536e41fdcbfd2190bba15fe9ff54198ec5a98fcc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -88,11 +88,13 @@ paravance-37:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87cf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index bce94b8e9a7728a8ac8f3ab29751f891fc567082..7791c1d045ef90643f5914e786032647a8b47a63 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -88,11 +88,13 @@ paravance-38:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb010b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index 2d8444e0c540f20e07007294b0de620fc3b25e4c..4a7d8c678377aeb31015d9fd4e7da1c730c60d54 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -88,11 +88,13 @@ paravance-39:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead217"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index d386f5d5a474d48f24560afe58b0f771d55f1743..432f16a227320bed9807660867e3d34a3d4b10c6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -88,11 +88,13 @@ paravance-4:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea08bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index 3e2a9f88e0d9db8789c25bee18500eec4f188d78..5b68a7f8842c6a604ee4db6541189af9bd179df7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -88,11 +88,13 @@ paravance-40:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7717"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index 8defe3dc5bf7cdec8c739c7ae9d3bbeb0325fee1..f52be59739696baabf5f482c3d35714e1e8e1720 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -88,11 +88,13 @@ paravance-41:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0323"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index 5b17fa103feac212ab55d8eedcea815a205ad6ef..5a6f7fd63adf55911989fafe19022b7b68a4ee4f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -88,11 +88,13 @@ paravance-42:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6d47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 626633e53263d0dd384943afbb9c5cb4b69ab9a1..9f6d1b55c79cc7b2fe53b6969b9386a66a1e0aa1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -88,11 +88,13 @@ paravance-43:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9baf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index 2b46db2697c7f87427dbeefc969a4dcf9ad282ac..933b50cf566c8e4e512368a4d8247da88b5eb3c8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -88,11 +88,13 @@ paravance-44:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0dfb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 8f8349d9459a4cec596b11445902e1f17c814922..4f4c99b6308201d1dc6303861caae64bad04df9e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -88,11 +88,13 @@ paravance-45:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 55e45002ef97701a205e6f7f2521a17b9898443f..3dad5d135c6a81127d4675ef28743d7b59e844db 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -88,11 +88,13 @@ paravance-46:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eacc33"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index 9fa21af534f59af36fbd5cda26ae942a7d3d5fb2..a7d1fb1e8d72cb05e741baef69b7b3371d69e772 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -88,11 +88,13 @@ paravance-47:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed580f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index bb34cd7bb40a36cd37102af1a291d7f8070539b3..8f71673fd8fd87aba2f8f089695e0dd715dbec7f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -88,11 +88,13 @@ paravance-48:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7a7b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 9926de704c3a11a2a5a34c29af4734f5b237f6f4..815c6edd9d1231e12a7da68a26df450063550ad4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -88,11 +88,13 @@ paravance-49:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fbb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index 0eaa621262283e004d0e43479424a2c7db58b2af..1eb2b6952de301619e2c844aca885b5d284a53db 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -88,11 +88,13 @@ paravance-5:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc07"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index d2638b842c40f8d834358f87406ff502cefe47d1..697250fb8ed24c19534fe617efa200bd781f778d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -88,11 +88,13 @@ paravance-50:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6af7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 133a6b1c255834deb8614f8fc2b924267a233f2e..8129d2cb55716d15b78048943c84505b3b6a8265 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -88,11 +88,13 @@ paravance-51:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1717"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 2d79c00614077c5717be00d07fe3a91a116e95b4..f1a4bb66d9d0715118a578926cebeb7bf53818fb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -88,11 +88,13 @@ paravance-52:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fa7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index c63d71f6d46e41867cfa1dbf34d3aa8c2a0bf0c9..5357b4a437c22c192c72d8efa642796b20eb14e0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -88,11 +88,13 @@ paravance-53:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed481f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index cd0714f903a3802dda535893c5039e614dea455c..b1dd020778cf4e40f0f3bc944533be7730fe4361 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -88,11 +88,13 @@ paravance-54:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9ef77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 0a3eec111a3d7dd1da3f3db13cdfe02f990e38ba..d63389a721d2fc71efaec07125fec32192a2234b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -88,11 +88,13 @@ paravance-55:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4ceb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 1ad74306383416302a97fe4afd3ef52e891b50dc..8011bd3c947cb06d5ce03203aa35da6eaa52765b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -88,11 +88,13 @@ paravance-56:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8057"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index cbf18ca6b08a9003ec07bc2c93701e8583ca8c39..3ae31933ab470de978e2325ca7a4510aba107f95 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -88,11 +88,13 @@ paravance-57:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc23"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index a28da29d816a10586b89d342e4b68de5c2489b90..09676a5d24c0780cb59999c141c92b57ef8db61d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -88,11 +88,13 @@ paravance-58:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d8af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index c57f2f657f0e6abd289e13c1330ac3e928012d8e..ed0d460f294b47551e59213bd886f9cb26504e13 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -88,11 +88,13 @@ paravance-59:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf54f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 7c9ce3616c673c1b8c367cb427d1324beb8a0b08..c59cfe0a8bed7eca604b6fddae0643aa6f59b375 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -88,11 +88,13 @@ paravance-6:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb79bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index d321f1ffda8f907c13c909f6832469f588b289bc..abc3812a15cd0f8e3399cb3b89c960e38df3b2c9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -88,11 +88,13 @@ paravance-60:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0767"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index ee9aafb6dfce6639159f1a0621c677facc754414..e5191a30bdcb4980a98d3c0a32211e0560863766 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -88,11 +88,13 @@ paravance-61:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb509f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 06b1209d6b4a3b38e77c7647a20f68b29395c352..51c7f38105293aa12e892d09a3424856ccdd43ff 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -88,11 +88,13 @@ paravance-62:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4b4b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index 8a4ca118532166cbec30249cabb228e059daf98b..40f3cf47655583996ba029b1e9ea3a3d364bf47c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -88,11 +88,13 @@ paravance-63:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5dd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 42704fd6a4b7f77505daa3f5835d6e222254deab..a5f0da8d9f1a0f509857ebdfef15a50436080951 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -88,11 +88,13 @@ paravance-64:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7977"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 623224b704bdcd3a76749f9329bbc4a69b15023f..48d8d1d3fe780bc2a8fdd2fadee44faa220d4002 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -88,11 +88,13 @@ paravance-65:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8797"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 69145151d2399768391a6d6f87715a576335ba0a..e68c2880b5ea1d673adac87c4ee516e43c8a366c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -88,11 +88,13 @@ paravance-66:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed593b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 16c27ca5d5c723a893dbd03e3745df581e5a0fd5..e8d6f9e9465522cd1fa341ec8a3844c05b5f1db1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -88,11 +88,13 @@ paravance-67:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4a2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index d9cb822c79c054a5e9b0ef846be2f0a1668460fb..64e6732b9331f69a94b627fbbbd377aea99afe35 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -88,11 +88,13 @@ paravance-68:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4857"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index 33218cf3f0dd46a44dc556ec46abd625c18df59d..41efa236e5e54268b409d96f1f0d6c002cf84d32 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -88,11 +88,13 @@ paravance-69:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb733f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 9aa3fc788653e75cd52017ce8a959a159fde5ad0..8e7a7c2bffb369fcf82de1af69264dc947ff0e89 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -88,11 +88,13 @@ paravance-7:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eaafe3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index 01de2d7e6813d3ec79b5a108af1fea10a58fa827..97841e81b0824f11a8d94abfa4550a42c6068840 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -88,11 +88,13 @@ paravance-70:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 80b90e445918dc39e81d4ca5cad8066ad87ad606..f4954de24c00e8266a226052ad2296e5c2a96178 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -88,11 +88,13 @@ paravance-71:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8fc7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index d8836ba29a9d7cb0cc7f081dd9b5cd0007522e30..11f1d862f2bc1bbc6b775f9ea71543f8b9671b0c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -88,11 +88,13 @@ paravance-72:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabb77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index 05dc2e8beaf192c325880f5d8652c7659c4e979e..d7d3260684a50b61b519e41e6797ee35f84ba07e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -88,11 +88,13 @@ paravance-8:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8003"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 05ae428267b803138c3b94fc9d5119cffa816f80..3ae355dbfbdeb78e640bbbbf6fff901cb684ade0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -88,11 +88,13 @@ paravance-9:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9c67"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 9a491b033117dd786c4611ea3bac9921d5e0be48..359ece83bf205f1c2ec79583c8da0be67c6f7712 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -20,10 +20,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 6c8bec2c00a3035dc0c81497c72c069dde874de7..f1b94bedf5fc7d06bd95d766af771d9eae25f2a6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -92,5 +92,6 @@ uvb-1:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index 8f46e00adc68853ba2e64c2cfb60e62069fe9acb..43f29dae31e0055b6c37d0994899cf2470710360 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -92,5 +92,6 @@ uvb-10:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index e2174872011107da295b68f99446180bc3bd68ad..cb2de1e5713af4203f7a2b7d970071d51f4280fe 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -92,5 +92,6 @@ uvb-11:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index 1831d92c365758982a678ffbf4a789be0c88c78b..c151ec6b286c6759ed8489ef0c17e822a81b6f37 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -92,5 +92,6 @@ uvb-12:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index 8b3810f2494609b20a25dea95b87d402e9b4d772..7159d2d981915f889524fdcecc2186c11d5a7091 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -92,5 +92,6 @@ uvb-14:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
index c18f524ca1311522307ebf700abe14c9d6cc324b..79980061dbbec5c4b331071f91aaef84954eae46 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -92,5 +92,6 @@ uvb-15:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index cf6ee43ee42c95f7a84f5885e8665fc55ef4a847..9baeb6511f86e155122f0822aaf21bd5983327e0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -92,5 +92,6 @@ uvb-16:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index 31f5a43fcbaf7420c76185ff0cd5f57475f02122..ab5f56b8e2e1802e3d22f07649597435c1c56456 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -92,5 +92,6 @@ uvb-17:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index 1726b62e7743583e1e0d58568bb7dc91010ce9d2..30f1047a981b9eb6ef4db23aa1f09d7272844c2c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -92,5 +92,6 @@ uvb-18:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
index fc1a13cbeda38e876311196d1f04d3b538cc81fc..375747fba175d2ac5e9b078c3d8c603d43b3ab11 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -92,5 +92,6 @@ uvb-19:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index 4cf9dc1e5d0a6d2174d85a6b0f823727f96f9870..a83b67978628fe0e8628fc8d20076f5c17e27315 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -92,5 +92,6 @@ uvb-2:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
index 3df8296ecd504bd03cd70bd8c5f10ed75f30e600..6e4aa1eb3dee7dba3a43391677f9d16f57368105 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -92,5 +92,6 @@ uvb-20:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
index 9e3f959fcc5a924001c093b05944634ca0c3c620..43a3ce9c6ed1a6a4c102db867b39df3fca070a5e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -92,5 +92,6 @@ uvb-21:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
index 89ef4247173ebdc5b69106cc2c1e12b84d09cefe..6f9f80550bc87c205587b16ef667ded6f31f14a0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -92,5 +92,6 @@ uvb-22:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
index 60492b0eccb8c30a4cecf08367cc2b291cbde986..3fcbaaffba5cd22b63f27cebd69bd88a6a44c0bc 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -92,5 +92,6 @@ uvb-23:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
index 5d6994e9353e0b8313058fb58075426e8fbc2b04..eb5bf2a3fa24f1308b2168821929d6609bb2cef6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -92,5 +92,6 @@ uvb-24:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 7e06f8f18d6a22a3fa830e23d139b3f04c368901..9b233f2960494acc93f3e79e77446cd7eed4fca2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -92,5 +92,6 @@ uvb-25:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index 87f069cdb5dc2f9f2c0272b9971cf8fe61a6f845..93cd3283af8aadf90fe7401affc9a1f01839c117 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -92,5 +92,6 @@ uvb-26:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index edcba37672a436ec6f7f72e1aecccfde539b4dbb..5eb52dd5c928c8bfe6418fc5d18f5a2ff90ac3d9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -92,5 +92,6 @@ uvb-27:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index 9b37ecae53d52a2c9e09c1acef8b859972495017..dd8fc47b85915acf705421529ba8e0da63f7bd6b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -92,5 +92,6 @@ uvb-28:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index 74938f2dcc0fd1b6662b5b98dd9c6f5d86b36a8a..15921ec55eff0ce91ea5ea613e33a6159ffc12a0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -92,5 +92,6 @@ uvb-29:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
index a32632e3d48092a3b1257c56282686bc7f9522a3..aef49cdc50d7bed1f9784ff5b7e4624c6421bbbe 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -89,5 +89,6 @@ uvb-3:
       model: WDC WD2502ABYS-1
       rev: 2.03
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
index 6b9a3ee75ef8c4bb42bfe9e8d96142eee017c3fb..b26c0022f89f154745190e5dc0b9b2d82a03a76b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -92,5 +92,6 @@ uvb-30:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index a52159d29f5c7c4b7b1a709cc45b75aa61c31c77..22cd2a480e3f5211f2f76bdf41043366930a5609 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -92,5 +92,6 @@ uvb-31:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
index 915b1ab39bb784482138ed3517131073badd88a4..53a9703a78e65b6676c56dadaf875e4c4943d4f0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -90,5 +90,6 @@ uvb-32:
       model: WDC WD2502ABYS-1
       rev: 02.03B05
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index e791b0ac47e1415a6cae4865655ee185f9dc3ed0..3bf8da6d8f242b3324be81e496b1c98082a2a2f4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -92,5 +92,6 @@ uvb-33:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index 7b17235a30d5e760997647b0c1056ea05b81df6e..858a9e7d87b77ff59bc37cb908836ade995c0bde 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -92,5 +92,6 @@ uvb-34:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index b1ab5e640dbcd71ab61435e2368950a77b8df4f2..8120ceae41410fed482567bdfb8f604291fe3d72 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -92,5 +92,6 @@ uvb-35:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index 54b80a08b5d16aa327b6c23e470b54086b85a848..70ecd90e25a2017e7ec30af0c70d750da4e6a789 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -92,5 +92,6 @@ uvb-36:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index 807edf40ffdb67c8099c78450d8e58b29309d20e..1fc068ff802972e99f4e8cb42507310125cbcf9a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -92,5 +92,6 @@ uvb-37:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index 5c40c550e99ff919d831dcb879b750d33be331e3..5ed4da2382f7300d81555aada7d7227ef2548bce 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -92,5 +92,6 @@ uvb-38:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
index 920b26eb4be528c73f511c293fdc262ee15f69ef..0517d4adbd461c76ab16cb4e183f1251f0b47a70 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -92,5 +92,6 @@ uvb-39:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index 66dec7619248605c4a0442407b28fb6a8daf9fc5..acb2386174d4ace338c5f7e8036e52fe618489c1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -92,5 +92,6 @@ uvb-4:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
index 71c2d57cf5d1b3c17fc121ebea0cbd069a65dba9..72cb9a7ae32c3876bd9e68d6efd5e94d845ca11b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -92,5 +92,6 @@ uvb-40:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index 787d6524dbef38141c539cd64b2c3798bb5d429a..c9d821b127cea54aab91fba7ab6a1430134813dd 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -92,5 +92,6 @@ uvb-41:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index bb9f1b8b417d0db5d3d438563a3085d5e3e592b5..3f3d6b4974f246b732204c105e4fa72ec37bf459 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -92,5 +92,6 @@ uvb-42:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index 08af4d4f1f22a72559f8c1e93cb7e951cee0b6b2..f9a717aaba1de9da7d184d82a6a0e50e3c3eb24e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -92,5 +92,6 @@ uvb-43:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 371e5074f23aa947259fa20c324fb59f9b0de9cd..728fa829344e862d4e6bf9b3f78e98af94f6a1e5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -92,5 +92,6 @@ uvb-44:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index 0f5808e74e39a746f9120735a4ecc439d4797f84..e1189b2faf4289e630a296d88ef27e5d719145e2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -92,5 +92,6 @@ uvb-5:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 06f5a5df7eed62581946cf26cd572ac233fd8cff..ffa2b37283c1fda170d71a68b89fe17998d47e19 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -92,5 +92,6 @@ uvb-6:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index aee9a80a903abf4b54eceefbcf4a9a2a3c04c882..7c0b1e9cbb4df43c612075380b0620766033ee16 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -92,5 +92,6 @@ uvb-7:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index 65d1f178556f5fda5b84f26b03c3c7a3876bf79a..1de09a60859366ee4e532781f7052757f1039c7a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -92,5 +92,6 @@ uvb-8:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 65a504d03cb5ffba58b7ae97d7256bcbda33989f..aedc6f68a3a9b3f07bf4dbc17bd4e21e94896fc4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -92,5 +92,6 @@ uvb-9:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
index a9bdf09db80f61f26fecc19077b0a9e5b256b020..4d8c1495e11c29e7b75a8360e6a8e92529a71225 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
@@ -46,4 +46,3 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
diff --git a/scripts/edit-input-storage.rb b/scripts/edit-input-storage.rb
new file mode 100755
index 0000000000000000000000000000000000000000..5b9ec03c1b20da2ec87b72956205e79a3ff6f497
--- /dev/null
+++ b/scripts/edit-input-storage.rb
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+#
+
+require 'yaml'
+require 'json'
+
+Dir.glob('input/grid5000/sites/*').each do |s|
+  site = s.split('/').last
+  Dir.glob("#{s}/clusters/*").each do |c|
+    cluster = c.split('/').last
+    #cluster_input = YAML.load(File.open("input/grid5000/sites/#{site}/clusters/#{cluster}/#{cluster}.yaml"))
+    #cluster_input_file = File.new("input/grid5000/sites/#{site}/clusters/#{cluster}/#{cluster}.yaml", "w")
+    #cluster_input['nodes'].each do |_, ng|
+    #  ng['storage_devices']&.each do |sd|
+    #    sd.delete('storage')
+    #  end
+    #end
+    #cluster_input_file.write(cluster_input.to_yaml)
+
+    Dir.glob("#{s}/clusters/#{cluster}/nodes/*").each do |n|
+      node = n.split('/').last.split('.').first
+      unless File.exist?("data/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.json")
+        next
+      end
+
+      data = JSON.load(File.open("data/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.json"))
+      input = YAML.load(File.open("input/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.yaml"))
+
+      data['storage_devices'].each do |sd|
+        input[node]['storage_devices'][sd['device']]['storage'] = sd['storage']
+        sd.delete('storage')
+      end
+
+      input_file = File.new("input/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.yaml", "w")
+      input_file.write("# Generated by g5k-checks (g5k-checks -m api)\n")
+      input_file.write(input.to_yaml)
+    end
+  end
+end