From 459268a7f91e020ae4b30a3421dc920a103cb2c0 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Fri, 13 Jan 2012 14:14:52 +0100
Subject: [PATCH] [nancy] Correct storarge device (array/hash)

---
 .../clusters/graphene/nodes/graphene-1.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-10.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-100.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-101.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-102.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-103.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-104.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-105.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-106.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-107.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-108.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-109.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-11.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-110.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-111.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-112.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-113.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-114.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-115.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-116.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-117.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-118.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-119.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-12.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-120.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-121.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-122.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-123.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-124.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-125.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-126.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-127.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-128.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-129.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-13.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-130.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-131.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-132.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-133.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-134.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-135.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-136.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-137.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-138.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-139.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-14.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-140.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-141.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-142.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-143.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-144.json  | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-15.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-16.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-17.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-18.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-19.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-2.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-20.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-21.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-22.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-23.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-24.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-25.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-26.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-27.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-28.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-29.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-3.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-30.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-31.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-32.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-33.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-34.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-35.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-36.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-37.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-38.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-39.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-4.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-40.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-41.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-42.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-43.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-44.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-45.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-46.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-47.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-48.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-49.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-5.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-50.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-51.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-52.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-53.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-54.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-55.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-56.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-57.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-58.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-59.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-6.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-60.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-61.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-62.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-63.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-64.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-65.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-66.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-67.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-68.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-69.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-7.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-70.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-71.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-72.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-73.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-74.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-75.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-76.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-77.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-78.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-79.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-8.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-80.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-81.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-82.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-83.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-84.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-85.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-86.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-87.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-88.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-89.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-9.json    | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-90.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-91.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-92.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-93.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-94.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-95.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-96.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-97.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-98.json   | 18 ++++++++++--------
 .../clusters/graphene/nodes/graphene-99.json   | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-1.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-10.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-11.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-12.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-13.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-14.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-15.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-16.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-17.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-18.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-19.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-2.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-20.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-21.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-22.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-23.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-24.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-25.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-26.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-27.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-28.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-29.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-3.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-30.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-31.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-32.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-33.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-34.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-35.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-36.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-37.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-38.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-39.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-4.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-40.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-41.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-42.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-43.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-44.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-45.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-46.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-47.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-48.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-49.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-5.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-50.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-51.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-52.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-53.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-54.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-55.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-56.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-57.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-58.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-59.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-6.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-60.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-61.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-62.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-63.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-64.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-65.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-66.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-67.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-68.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-69.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-7.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-70.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-71.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-72.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-73.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-74.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-75.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-76.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-77.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-78.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-79.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-8.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-80.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-81.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-82.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-83.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-84.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-85.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-86.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-87.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-88.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-89.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-9.json      | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-90.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-91.json     | 18 ++++++++++--------
 .../clusters/griffon/nodes/griffon-92.json     | 18 ++++++++++--------
 generators/input/nancy-graphene.rb             |  4 ++--
 generators/input/nancy-griffon.rb              |  4 ++--
 238 files changed, 2364 insertions(+), 1892 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
index 22533ef6855..c1434f93c89 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390003,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
index 00d661fdba7..6662952dada 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390012,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
index 1db67d7c835..45eef12e913 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390102,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
index 65c3f508a0f..d36461f8417 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390103,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
index ebb5a959b5b..968fc13e33e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390104,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
index 98945811263..e5e20d7c338 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390105,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
index 2e0a7a71e0b..fdede44e0ab 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390106,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
index a0fc9595cca..0270b991962 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390107,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
index 581f47ca9fd..2158c682d48 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390108,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
index b4e2c8a832b..2f8b3c66dc0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390109,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
index c6b80f28d6b..fed739cd052 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390110,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
index b462e5d314b..7cdd372186c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390111,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
index 64f322b971f..b497c18ed27 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390013,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
index b25b7ce7162..0d161a28d57 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390112,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
index 6831b8fd61f..e6ffe6615ec 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390113b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
index 1b32afcceb8..9fefb023546 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390114,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
index 4307a5e0b4e..fa9b3338466 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390115,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
index e2de0369273..0de433d24d3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390116,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
index 6fa9fa29948..dc08c587040 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390117,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
index f12a03457cb..aa7539ef2c7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390118,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
index f27be451462..3eb336fb715 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390119,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
index c5bfa132f93..a7bef08517e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390120,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
index ede1e21d70e..168b9f97205 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390121,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
index efa0a311930..836c5a237b2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390014,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
index bd634f62aa7..2354fd0c4af 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390122,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
index 2ec65dfaedf..485a66885f0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390123,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
index 972557389c6..27b4a626947 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390124,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
index 7834c86b1c6..986af99a76c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390125,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index 807fc38b5bf..982d6b6f32f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390126,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
index d27c8040fa6..f74c741dbc8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390127,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
index a525c7eb6e3..0e169b2deb0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390128,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
index b796c9d8e20..bab5ded05f9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390129,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
index 9d9a11a35ec..7eb97f3959c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390130,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
index 7fe326237f5..116b4b5d425 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390131,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
index 465d7d70532..abd28ecf3b0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390015,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
index aed2136482b..47190635f77 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390132b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index aeb4ce9777f..bbcba6ef89e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390133b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
index 5c5f075d339..3c9cda61184 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390134,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
index 0302851bb4c..4d4a56cef71 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390135,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
index 4afb05e45ce..b0938f90dd7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390136,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
index 7fea46c11d7..40b4780af26 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390137,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
index c9ea7bbdbe6..877d65ddc8b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390138,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
index 41edafb7791..9a34fbe5227 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390139,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
index f833bcc6f5f..9082f090823 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390140b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
index 533834664e1..dcc371eb6e2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390141,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
index 558aa1135c1..bde9ce9dff8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390016,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
index ed9c49e370d..cdd5bea1a2a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390142,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
index 83de883b691..2eee86be42f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390143,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
index 211900ed458..73117b9b816 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390144,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
index c63fc0d7daa..5e66c10291a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390145,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
index 3e16cc01616..ed7b6107e29 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390146,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
index 96697af2698..1f5bb9dd1c2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390017,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
index 290a265bc0b..986e30a7cb2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390018,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
index 0299f3cb14d..a8e571b302f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390019,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
index f8a0d5479f7..05e861d2102 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390020,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
index 6856c58db79..41a5cd0010d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390021,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
index 5dfe017ceee..8cad207f917 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390004,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
index 7325172de8c..0f1f7ccb928 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390022,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index e9258f0f25d..dff81989a45 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390023b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
index 53d57da66b9..949806514fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390024,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
index 0ce5556f68e..dcf34d430ff 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390025,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
index 05eb76cdc11..52ce8f2e290 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390026,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
index 5afd965de4a..6b9aa692d66 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390027,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
index b9e582d1c5c..9677bee4aea 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390028,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
index 5058aceeec6..9613848491e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390029,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
index 592c6d087b2..3cd424d44d8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390030,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
index 4339a05d971..885c40dcfc4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390031,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
index 62003d2d464..90e28de399f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 605634005,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
index bf2bdc8b241..1c9722597c5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390032,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
index 68195a39a96..9fedfe3349b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390033,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
index 17f7172bdfc..d0bad2926ec 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390034,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
index b20a9d69370..3fd20e4a272 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390035,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
index e25a9030c5a..dcc7f90d863 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390036,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index 53596691ac3..44d67bbbb16 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390037,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
index 22b822ca7de..8848ad9f195 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390038,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
index f53acf2c038..ec913f503da 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390039,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
index ec033c3c794..a79be691541 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390040,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
index 8f1cfa746b3..99fc4a7097e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390041,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index be706cdb74f..7e2436ae521 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": "1009390096b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
index 6b36ca46a1c..3a888418797 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390042,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
index 4b09973b512..4371db7f799 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390043,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
index e4e7d803fab..1e235a5315a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390044,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
index 96554cf9aab..6d14c2eb94d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390045,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
index 80a70d6426e..b5ceda1adb2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390046,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
index 4e7f55af96b..5caef60b508 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390047,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
index c96873bebee..5b5f0c00948 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390048,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
index 0bc6b72806b..1087bd5b0bf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390049,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
index 22fc24227a6..4952d9ceb8a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390050,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
index 202fd585fc5..468828d2395 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390051,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
index 372ab152bd2..b9eb6279fa9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390007,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
index 8094f8fd948..3265681029e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390052,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
index 966732f45ef..c75e4217296 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390053,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
index 50e882abba5..3b65a085f72 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390054,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
index 0a88d8a194d..80d149963c0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390055,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
index 5eedc00a3d1..7d08034d24d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390056,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
index d2431157ba6..035e05ac9a4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390057,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
index 571d6a9550a..c5c1ce5e4e8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390058,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
index ce22acc7a96..f253f1f8292 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390059,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
index 42806341226..9b7246ae532 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390060,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
index 99c6e6a6a37..106226fd8c0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390061,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
index 05c3a330761..84c0597c0aa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390008,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
index 498f94a2aa2..d7b9fee44fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390062,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
index 6e1b6e90cbe..371ab23c102 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390063,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
index 46e2dbd71da..d27bb363f46 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390064,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
index 9b969013740..4e3772eca39 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390065,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
index c2b7a5665b5..71a02066695 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390066,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
index 698377dd68f..80437040a32 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390067,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
index 2c2ce9dbb34..873219091e7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390068,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
index c566aa5aaf8..b7a05773e5b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390069,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
index d3e3c7f09df..a1646bf4aa8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390070,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
index 019bcf94d96..871c4d105e7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390071,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
index 7097418b48d..9928b7e07c9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390009,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
index f61ccc5ea7b..9aca62016a8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390072,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
index ba17c60a296..ae95144ee2c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390073,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
index bb5bb22c4e4..baeaa045057 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390074,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
index 2a0ef59eb14..e4856c301eb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390075,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
index 1aabc71f586..1e779e2154f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390076,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
index 6215e96dd5f..788816d8407 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390077,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
index a693d96b4d9..14792e5767a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390078,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
index b26b56fa8ce..1f6d57f6240 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390079,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
index 8b099c8960f..bcb53979462 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390080,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
index 13180236bf4..4a44d596146 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390081,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
index 2d9d19328ba..02cfb3b11d7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390010,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
index 35173341929..39f76960b38 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390082,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
index cf0bed6b05a..1a8d908091e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390083,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
index 6600d828a9a..52c8880d17f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390084,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
index 3888853d9c1..05569d7d08c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390085,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index 42e30960a8e..c65abc1263b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390086,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
index 710abf6e8e7..fb93b961f19 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390087,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
index 8e1068e7fbe..2a66f803912 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390088,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
index a4e71ddd4df..889c110fb5e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390089,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
index ea3a6d2a914..b7ed9e4cef4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390090,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
index e37bbc39bad..0bf4dc82117 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390091,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
index 737609e5d28..29f8bb4f50a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390011,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
index 9ae27161eb1..eb4a0dc610b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390092,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
index f4414c5ff77..acb38ede673 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390093,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
index f58b4dd2774..f7fee6ba567 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390094,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
index 103bf8e055a..02b4005c0fb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390095,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
index fc1372fbd71..55274b51938 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390096,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
index 0fda9c8babf..3e5f1924495 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390097,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
index 15c1df4123d..b55d1d27dc9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390098,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
index fb63200e0cc..59490ce1d11 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390099,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
index 483d7c207c0..59b62f81466 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390100,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
index 88319311fc7..f62b1aaa09c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
@@ -112,14 +112,16 @@
     "version": "X3440"
   },
   "serial": 1009390101,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index 6dad51e5fef..7331645b434 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530006,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index f1c45f68039..de16f7a5da5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530015,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 508e603514f..64cafcb29c6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530016,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index 2dc16f672c6..aee024ff085 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530017,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index d67ddf35a72..f5b83afc577 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530018,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index f1030a4421d..8005c21d72e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530019,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 929287b6c09..25e48fd8b9e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530020,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 682b462cb1d..870a8e1f0df 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530021,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index 5ee1b8008d7..c4b76b85e8e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530022,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index d80395415dc..64ced75d9e3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530023,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index f7e466e2ec6..f1ad0ba15a0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530024,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index c422c3dee2d..91ed61dfe9b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530007,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 50ab53ce795..396ee3f06a4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530025,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index 6f632b109d4..82135032a96 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530026,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index d0d8d94d57d..6a01f3e3bb6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530027,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index 5aae63977e0..ed8a26dc799 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530028,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index b039f8b7dc8..d780c494257 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530029,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index 9183a59f55b..a847c133cbd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530030,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 35926d86892..8873342bed1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530031,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index cd284558dd3..f141e48392a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530032,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 3301988819c..a478afbee70 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530033,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index e650679325b..2ac186e3dd5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530034,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index 438a863ebcb..e91f23f3edd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530008,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index 366324508b4..983cb3b93f0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530035,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index de848dce39c..3f1b045a09c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530036,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 0721d7ac2bb..8b9af62fb8e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530037,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index 37f37e68296..24fa9f074ee 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530038,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index 8b3b386e4d6..5ce239b374b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530039,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index ffd64d263d3..fd9c07022a1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530040,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index da695ab3186..38bcd4e1dd7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530041,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index c584b12c506..48f87e7ad56 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530042,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index 3dfa55ec065..162de98f586 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530043,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index 1a2fe234a94..4ac671c9fcb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530044,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 3812d7a9f61..a070e4c23f5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530009,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index ed9078332a6..25c0158601c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530045,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index 93e70a0946e..5016296c9ae 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530046,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index c1c8f3f372a..3e775555a35 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530047,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index 4841bfac90a..a58b6c81f89 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530048,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index 6c4037dfe27..d8707d6bcad 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530049,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index 7b61d2e0282..8a8d037d407 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530050,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index 1814eba5304..56e1cf0e9c2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530051,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index 4140a9418d3..4c23b7355f9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530052,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index 4a0138490ae..a7c759de336 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530053,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index 2b2beb130f9..336e37e56b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530054,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 454a300dd15..d82d0820c67 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530010,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index 00e9ad35d24..2319fe4840f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530055,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index b2ca14c6148..4a288bded27 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530056,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index 0cfc8ed8128..fc6abcd88c4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530057,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index f467087edae..51c33def7da 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530058,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index 8255e529605..8094515c780 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": "812530059c",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index a576802e53f..7e2ae048d67 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530060,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index 6cf672ad43f..376b62d6d61 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530061,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index 922961389af..6bdba4f1c2c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530062,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index cf25644678d..099354c6e2b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530063,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index b7314b7f55b..cd2948a2406 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530064,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index cc6b84611f4..5a01883692d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530011,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index fa969772960..a607dc6c6f2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530065,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index bbe5eae22d7..4508d9d742b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530066,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index 923a3354a62..db78111ee04 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530067,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 642d7551bfc..d3dc78991bd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530068,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index abe04e2b768..6198153ede6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530069,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index 9bbd59392ec..50e1630f403 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530070,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index 87349cb4cf6..c3a3e5a39b7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530071,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 995aeb43755..c9204cf3676 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530072,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index 3a3e8913a42..5252cb09109 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530073,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index 8a90e7483c7..f40edbfeca5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530074,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index 5cf0ee99969..9b2a928561c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530012,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index d495a7688bf..19fe5dd16d6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530075,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index 7619586950f..38f5720979d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530076,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index bd2634a98fc..b346a0b9448 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530077,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index 38ba67857f6..9334c08be4a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530078,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index aef3f9e1381..4caa62bff66 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530079,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index c76ee019d6f..03307bd4df4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530080,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index bfd7b9aaa90..d96089cbf37 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530081,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index d2cc76644bf..d1274068b07 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530082,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 34abac45e1d..6f4735f3d64 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530083,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index d00caef7e73..3ef39248d6b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530084,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index a7701fbf643..c3794e15f60 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530013,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index cb752d3ca4d..823d20a5373 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530085,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index eebd0168027..02096efaad4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530086,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index 1732669998d..06e41a9acc9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530087,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index 2f8d07fda05..19563650d8f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530088,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index b8255232dfd..98d91a86619 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530089,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index b5f0e4d94cd..16a7b8b0d23 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530090,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
index 892acaf7995..cb495d51b96 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530091,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
index b0822d17dc4..fd800828fb4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530092,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index f1e7679d307..1e461a17291 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530093,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index 4717c073752..8a2bf0a1b77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530094,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index 1c8c09c6003..9fc6795c7ad 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530014,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 318b26868d6..319fca4f2ed 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530095,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
index e8eed1d7f98..8f5e5e20015 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530096,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "Hitachi HDT72103",
-    "rev": "ST2O",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "Hitachi HDT72103",
+      "rev": "ST2O",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index bb91f73a84e..a9b6347eda6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -106,14 +106,16 @@
     "version": "L5420"
   },
   "serial": 812530097,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ata_piix",
-    "interface": "SATA II",
-    "model": "HDP725032GLA360",
-    "rev": "GM3OA5CA",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ata_piix",
+      "interface": "SATA II",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
+      "size": 298023223876.953
+    }
+  ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
diff --git a/generators/input/nancy-graphene.rb b/generators/input/nancy-graphene.rb
index b64b220d6ee..a19b36b6eb5 100644
--- a/generators/input/nancy-graphene.rb
+++ b/generators/input/nancy-graphene.rb
@@ -35,14 +35,14 @@ site :nancy do |site_uid|
           :version => nil,
           :kernel => "2.6.32"
         })
-        storage_devices ({
+        storage_devices [{
           :interface => 'SATA II',
           :size => 320.GB,
           :driver => "ahci",
           :device => "sda",
           :model => lookup('nancy-graphene', node_uid, 'block_devices' ,'sda',  'model'),
           :rev => lookup('nancy-graphene', node_uid, 'block_devices', 'sda', 'rev'),
-        })
+        }]
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
diff --git a/generators/input/nancy-griffon.rb b/generators/input/nancy-griffon.rb
index 37407a2d8fc..3dec678447f 100644
--- a/generators/input/nancy-griffon.rb
+++ b/generators/input/nancy-griffon.rb
@@ -34,14 +34,14 @@ site :nancy do |site_uid|
           :version => nil,
 	  :kernel => "2.6.32"
         })
-        storage_devices ({
+        storage_devices [{
           :interface => 'SATA II',
           :size => 320.GB,
           :driver => "ata_piix",
 	  :device => "sda",
 	  :model => lookup('nancy-griffon', node_uid, 'block_devices', 'sda', 'model'),
 	  :rev => lookup('nancy-griffon', node_uid, 'block_devices', 'sda', 'rev')
-        })
+        }]
         network_adapters [{
           :interface => 'Ethernet',
           :rate => 1.G,
-- 
GitLab