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 22533ef68553c549db8846221d3ccd3ed4ec565a..c1434f93c89e5d8167d5e9f88d4766efe683fecb 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 00d661fdba7aa920e980511187701582944dc044..6662952dada0a232ff00a3b5ba7957bbf8a4752b 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 1db67d7c835ca244556ce109c6011d63264104ab..45eef12e913c080b1bc338ad528a22a1c29920c4 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 65c3f508a0f400bac45ebc052680ed7b939ed753..d36461f8417d3e7e7e27495bdb7ac041445b700c 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 ebb5a959b5b0d5d3dbdc1d9a55ac58c23003b86e..968fc13e33e8f0161c3567ccb65c266cb089d356 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 98945811263456ef3af63f3a53a2d8fb8fddcbfa..e5e20d7c33867d195900c7d3e99bc7a00292dc0d 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 2e0a7a71e0b602098ee789eb9a516d8d13ea4256..fdede44e0ab659cdfbb5790a486a7a21060dde3f 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 a0fc9595ccac029f26619e038bdfa271be03dcf8..0270b99196236ba8e6b5280d3fded0c0f4584c5e 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 581f47ca9fd20d47331fa1cb7a2deaffb96b2198..2158c682d48cf9967e179b286ac7349189a0a327 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 b4e2c8a832bb9401aa9f9eb21ce490fa99a9c486..2f8b3c66dc09397ec054ca51c7a89caa6d8a10cf 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 c6b80f28d6b982cdecc4c0ef687a7eea34e2512b..fed739cd05200816fc6bbd4e572ee122debb7fea 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 b462e5d314b9b57e00b402bd9438de017a206e19..7cdd372186c920402cf37ca28afb27087af98049 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 64f322b971fd28c0cca720df03ff7b41f70d4bde..b497c18ed2746d9eeef5d1e2b97e4ef7e4180642 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 b25b7ce71628d5e3ad5e8592d7e868c94c1d8eed..0d161a28d570cf57d1e04e4e94e82bd95d6f94cf 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 6831b8fd61f5d8b4e1b8dbe9a36b9d540f9d7f38..e6ffe6615ecd6999fa2cd0cf40a8c76f7d927714 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 1b32afcceb8684ffc08c207b8282501c5600a7ef..9fefb023546cd2d12befd64b634145ae83cf1261 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 4307a5e0b4e23d1ab9987078f166bb4afa16c6de..fa9b3338466ddab166b4c1e2ec99b14111bcc10a 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 e2de0369273d866c6c6f2f5f34a3c89232d7b561..0de433d24d3987bb9acff3a4ac64f34cfb284c41 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 6fa9fa29948945f974da623b99e79677238b9732..dc08c5870409c8df1a14c12da5710ef31373980e 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 f12a03457cb3aab30fc2f537e7845102098e887a..aa7539ef2c720882cd6a7d3823805c51adf491a1 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 f27be451462dade08b4fbd320302fba210f64b99..3eb336fb7153f1cab49d3e1b4da53363000fbcb4 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 c5bfa132f93361550f1116f4d94201ed4d9fa34f..a7bef08517ed3775ab0b4282db6ff59a878f52e2 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 ede1e21d70ec983d4783fae1b23298242266f688..168b9f97205a85100101419e9cd5c0f45aebc235 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 efa0a3119303e42b83ec4639ad67564a6b19301a..836c5a237b2cafc76c97283da7ee5750bfe07ed2 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 bd634f62aa74f792dcd75a4587a4b508b06c55fd..2354fd0c4af78b70577c4f0a070738df239ec3f5 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 2ec65dfaedf1afa40e95944937c0ceb1a3cf8fd6..485a66885f0fde11a42d95d3bfb53649142bf8c8 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 972557389c6083e427c9e7bf1b8ed25dd1296366..27b4a626947da7566dc9becee6a9233445608c18 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 7834c86b1c6d97d69c2acea1ded7d0c9a47e2582..986af99a76c20ce85db631fe3837613f1fd58a4e 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 807fc38b5bfb2bf71d65382fae8d5deb3b3f85bc..982d6b6f32ffbaa71917b4d61e361843aebe696b 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 d27c8040fa609f20b2ae148579806fe8c91d088b..f74c741dbc84da54682014f31922555db2258f1d 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 a525c7eb6e3c907df4f743e5528fe117d8642cc5..0e169b2deb04cf7d7b765c1c524130202d37ccbf 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 b796c9d8e20a6e1a281981914065588a12644e0d..bab5ded05f9092548a88417458e613430f076907 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 9d9a11a35ec4a8759f2a57eb706105fec9e141f1..7eb97f3959c9e43959ec72bebd07164d9bc379bc 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 7fe326237f565e3a67e225f97a1446ea3eefe3b7..116b4b5d42576afa356e8db453ac2baeee82c0de 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 465d7d7053290c5953bcdcd921c65823045b26a7..abd28ecf3b012c1f08958e4c0e973a73350b935d 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 aed2136482ba624f1b0b6b552b9c9676dbd00a17..47190635f77170fcaad2337965cb45ebec360f4e 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 aeb4ce9777ff9aa40e5e2f0cce4580092db648ed..bbcba6ef89ee3dd6640e6f0c6e8ef22a8fce4e28 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 5c5f075d3390f27048db900563b5a3ef5b64748b..3c9cda611841caef12cd5706394b8c891ec41029 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 0302851bb4c71ccdafdba24e518e5f64f15bf47b..4d4a56cef71a6456f31888feba327a1fbb5f4462 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 4afb05e45cedd4798874bd49d01d35a937768c36..b0938f90dd7c7993a1a7e5f9dc30d8c8e962960e 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 7fea46c11d7d76eba5a9ee06a752d0f476b5deeb..40b4780af2662dac45b2d41bc3b91681261e1bd8 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 c9ea7bbdbe62824e40d141ad384d6916c0a3ac3a..877d65ddc8b5afa5e980027f32bc4f2e6f5abfff 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 41edafb77914655c1a61ee14556631ec54d4da91..9a34fbe5227125bc551c5dfd3e55c0ef49ce1cf0 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 f833bcc6f5f44e5663bae33cf2a6dc73877a68f1..9082f09082347820d44000d7ddfbb679b9b1f261 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 533834664e14caa1cd6f51632c97a2b6cb48cf8a..dcc371eb6e20a07879655c51246ea626c33d31cd 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 558aa1135c102420b62abfd148088f696721bf97..bde9ce9dff802ee8a8b1f7ad061665072772ef83 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 ed9c49e370dfe7361ee6b7f97efc2dcba274bc86..cdd5bea1a2a15a7c4f9e67d969644b48b6813dbc 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 83de883b6915648423af1a2482b7984d83b25328..2eee86be42f75f2273a40d28ac653b7376596d83 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 211900ed4588f40df4495b6aa6f6168b871b6176..73117b9b8168e3ef9a513fdbbb8f882fe2b3238a 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 c63fc0d7daa1430f043597b4186724cd84cae92b..5e66c10291a0ddb29a47cfc3742fe902194c9b54 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 3e16cc01616416c2c920728c30298a638af30c73..ed7b6107e29eb7c6baa9604f82da25ebee391a94 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 96697af2698ac7941609c2baea82a368623f5f54..1f5bb9dd1c26523c6636e0d80de5a434aedcd86e 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 290a265bc0bf4e26494cc9c6d81b9dfbbd5f30c4..986e30a7cb29457a4d2deae1d3acb7db695bda9c 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 0299f3cb14d054c2c26725553898d4208f4a4682..a8e571b302fcebb11d53a3a2c1f235330c8aaf09 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 f8a0d5479f7f3673a210d74248ac5aa63bfacfa0..05e861d21026645fd09e82f39c038670edbba124 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 6856c58db79734e60517f2906de25040692cb66f..41a5cd0010df8c96f27a492952e13ddecce58496 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 5dfe017ceee17e10c18c19ab36918153e501162f..8cad207f917920add1a36def6430750acbf74f68 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 7325172de8c488302d47ec26db7c6dc7b9a4ad89..0f1f7ccb928c1325c46dca39d9b045dc73a210bb 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 e9258f0f25d39c074af39196f3d8dbf231c51399..dff81989a45ecb2436c4bc7685493efb42e1ad62 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 53d57da66b9e15005c23018b7721d4a643c955ff..949806514fbb5f7bfc34d65f40d5f5bcdf546997 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 0ce5556f68e035adc82e4768b4bee66039ad6b83..dcf34d430ff99520028b903c6fe9a00ddba9afd4 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 05eb76cdc11ba1e4aa97d44a0fa95abe893b08ca..52ce8f2e29003683311a48434864f3b130a5d5d1 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 5afd965de4a445dfdcc3b88aa8e78ff6f076d14b..6b9aa692d667d0e628c0c8ca27647446dbb024ed 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 b9e582d1c5c0b50fa400898caaa45ecc0243b32e..9677bee4aea90ecae23f92c520d5cf68e49f6295 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 5058aceeec687f3b482ad1f475193755a880c81a..9613848491e6f1f056e1dfdb590de3421bb4a9b0 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 592c6d087b2b9169a418f8193aed24e639b1ecae..3cd424d44d89d6873d92e7a2e0beffc38728d33b 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 4339a05d97151d7c04b7bdb52a09051e62092bcf..885c40dcfc4245bc3c6e0170f16a4c27fbecb7fb 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 62003d2d464ad8a31ae8328f8994aa1fcdbda6bf..90e28de399f6b244c0c21cf882ca093d26d76863 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 bf2bdc8b241e17adc291a92dddafb82999e01c08..1c9722597c58607bf2bfaed8f1f38cfa19c78281 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 68195a39a9606c8b19f413a4896be636692e6ff8..9fedfe3349bc671e1520a998c60fc017f5cdcaf1 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 17f7172bdfc19e8159fa258190e9bd9414ac0820..d0bad2926ecfe82030adf432da658ca489db85f6 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 b20a9d69370e796e59bd684c8224e0e8e32c75cc..3fd20e4a272d4e5a2dc51655bee1e283352d3aff 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 e25a9030c5a379e0a1a85d63bf90245e2409c141..dcc7f90d863a09a23f8a372ad95f665662a04c53 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 53596691ac375b22dc8fd3e02ac720fd30130b19..44d67bbbb1666db16dbe1a474835609d484612ce 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 22b822ca7de27ddea435ba5d87c5f45157583990..8848ad9f19525efe1a1d5ed9bb8a7a8fac744bd5 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 f53acf2c03847352b1d97632cf3e204b4443b775..ec913f503da628a88715cb5406ae355da1352f22 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 ec033c3c794ab9a5127d8caad1a60755d20d44da..a79be691541082c85c7599b30a4e0d6316d64eda 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 8f1cfa746b327f00c824e35b112885105b30211c..99fc4a7097e021135ec5d549db590694784e8a2e 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 be706cdb74fb1d9f3178eace78b5adc3cd70efc9..7e2436ae521e96deaa2bd3a6f3e545f90802c6b2 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 6b36ca46a1c93efd8e80037c65f9d9c06bbbea13..3a8884187976b663504ff486096dee2e0e986757 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 4b09973b51260aaeda74e2870290c2095b8a902f..4371db7f799e01aa0ae87f40691a6331b2b8026d 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 e4e7d803fab927da6d56c0c6b289aa51d3f33acc..1e235a5315a88ad8a385e9472dd2a36c54575499 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 96554cf9aabc102bbd40c08f33b0b0b1cd48ec9f..6d14c2eb94da0e6601b334ccee3761d5de5dfcfd 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 80a70d6426ee489f5aa1178b57a0dccf7aa5ee25..b5ceda1adb243e4db5fa4d17a982b5a6ae56e0e8 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 4e7f55af96bbdbd2f30d949c0676296d54060aa8..5caef60b508ede89bdb49d48ea0d1a388ee46d59 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 c96873bebee67b4e8d2c368fe9e801f93f204bad..5b5f0c0094897b81b74b619308c549ca00c9e702 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 0bc6b72806b18c24bffcac0cfcff27403597f4f2..1087bd5b0bfbd3f5b4dc81ccf97c6a9ae2e5d653 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 22fc24227a64763b94b38e359ec8aa39af9c2cd2..4952d9ceb8a5740b438ba4fe7eda6d66d851dede 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 202fd585fc5235055f3422d1a55d91558d2357f8..468828d2395489f577dd92d637b6d23c414545d3 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 372ab152bd2249f0e1e22ec100ddb879f4f5baaf..b9eb6279fa98d867417a02f15c4fb55637745a36 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 8094f8fd948b22e8093a580afcb319c050c9ddf6..3265681029eeaa84428bcccd7f9eaa23fa8fd729 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 966732f45efccfe625610cfeb22f3ff7a844e547..c75e421729687f6e5c24bcbecf6d3f76fae710d7 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 50e882abba589c83e5385a155fc580593e5c30bb..3b65a085f724463845e8d826ebe75f8541201efb 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 0a88d8a194df4c913727ad5f2d29027e9e1ec9ef..80d149963c0deb46aec218a6afff6b1216d546fd 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 5eedc00a3d1197ac56d65febe180a927c6f63e5c..7d08034d24d419b94de3e68798cf878f21a266b8 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 d2431157ba6d5c7b3fb1b01a5cb9298749d53200..035e05ac9a42900aad068082eeacf22116048360 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 571d6a9550a3818bff683c3bb6d2d13fd0974489..c5c1ce5e4e86b7b2648abe43f84736169c060592 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 ce22acc7a96fd696a7267286fcffc0135b1efafa..f253f1f8292bae69b855aba73310d4920cb29693 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 42806341226ac6a657e682d456172e276dc8a6ed..9b7246ae532e5e5567b613c87a4d458f03465d5b 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 99c6e6a6a378220f66809529f83b1b437770b4cd..106226fd8c0a01ba6a2168513add735f812880e9 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 05c3a3307617090e1890739542e9a9575b9ee73f..84c0597c0aa12448ad6c7609b03479b0aa802824 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 498f94a2aa280923702f9189536e207d0c90fa89..d7b9fee44fb4274f6faedffdd311df34bc9f82ae 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 6e1b6e90cbe344935645900d6061758cf9dc9b91..371ab23c10288b7d31d8ab01a7498a0525cd939a 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 46e2dbd71da0b99777bc322999c140378fa0a8c7..d27bb363f462393caa8e615c462b1a3fa597c721 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 9b9690137408b60a9ec34871f848b72d4353412e..4e3772eca39f3789446e32f38a2cdc4281a46ad2 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 c2b7a5665b5ed81006858fff85a04f9a4540edf0..71a0206669542acbf460021177b19873fc78aea9 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 698377dd68f6ea0887e579cddd97738030f70773..80437040a3280d44265937f16903d69f05d84032 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 2c2ce9dbb34887b8958e984fb0cb645f3af80800..873219091e7a33387ba9758dbe53b18b905c08d9 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 c566aa5aaf81309136fca718e1761c4209af01ef..b7a05773e5bd2e751c93d8e78568fb68eda2d03c 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 d3e3c7f09df0254a31c0abb3ff58b258baf3b634..a1646bf4aa8064838dd6a07858e9a8c59af8b780 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 019bcf94d965f1b371cc0d28de7a5560953f9c49..871c4d105e7f412fe04ecb148d66a18c1dd12453 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 7097418b48d3b6ffe310fa253319d3134719af80..9928b7e07c913c83a3e3bb4ed43ce0cd78032f5c 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 f61ccc5ea7bc8a82f0074da8966fabe5df5b12d4..9aca62016a8792df58c9a81be90c84e203b8aa53 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 ba17c60a296ff59fa3ab6307e219a1a54290dffa..ae95144ee2c3ecf85c93eb27b9eb241150d314c1 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 bb5bb22c4e404c6a4903d155720414c683902676..baeaa0450576850ebcfd5c0d23c9409379c26ec5 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 2a0ef59eb14b51040f40d864df7a642fb6297bfa..e4856c301ebb723e87c9ec0879526af7c67d9242 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 1aabc71f586aebfe7a8de52504c215a73f5edd73..1e779e2154f66fdc5efe7a7aace8555911152ac8 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 6215e96dd5f1a3b846037cd6a6513c805cd6a4cc..788816d8407c09f06b9d3aebfe86f5c4dd619f1c 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 a693d96b4d917c5ce367eb4194e61cc0b14ae9fc..14792e5767aa04e803b0fb3be53cf2aba753da09 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 b26b56fa8ceee17fcab410731e4cc6677433ab10..1f6d57f6240d1b7d0aafdca6585f31bfc19e5d08 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 8b099c8960f1093dc61c295522a7dddf1455a98d..bcb53979462a5aa7852e8caba544bb1672f95970 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 13180236bf468b57870b2d92f9084ab141b61544..4a44d5961464a881b2c38e392bc48920f1ed9dec 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 2d9d19328ba2b4bd1a6ad0dd16b0a3e6c39f187a..02cfb3b11d71af70d9289331c7282b48883f835a 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 351733419293aefa2ec692d0e89eb5b1e01d79b7..39f76960b387f401f144d4d201ad6733ac7fb9e7 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 cf0bed6b05af9847b43da1ebbc00fc33d01a3f5a..1a8d908091ec8b5e17c05dc30412e72ea81a9456 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 6600d828a9a47fd781309d943915677ee0f9aae2..52c8880d17f169133ce4b858030e53e928ccbe11 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 3888853d9c1f6d8d6a9bb13e81ad6e6c4b1326bd..05569d7d08c62df8bb68327a819090bfb86bb2ef 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 42e30960a8e5c8619e7b29e3a0e43ee2bd3216b0..c65abc1263b76bda660395d43ae9e7bb3e174d63 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 710abf6e8e78c2185eebea075cb2d76d42b2e662..fb93b961f19820a405053113c9dd356b3dcc213e 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 8e1068e7fbefd3478d7b4038a2c841c5a9c64843..2a66f8039129d3ae1b9e88e1427f371bd7b75012 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 a4e71ddd4dfabafa7cd8888acdf1a7d43531d167..889c110fb5ec78b7a49f99b934ef73587f5121e7 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 ea3a6d2a9146efa9ef84a914a4f37ef2198fc2c2..b7ed9e4cef4ada733033067d4d08030a72d26201 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 e37bbc39badf8c4f9dfd34c047bc79999cfcc1ea..0bf4dc821173ff1bcc0cbbe89504eae1822b179b 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 737609e5d280df04c340eef58fc91b48e2d5e20f..29f8bb4f50ab188f38a0c919e82ff42553a536bf 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 9ae27161eb14a86414cdd1a737c1bbcf3967f228..eb4a0dc610bbe306a8405144e407041d8a0c8470 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 f4414c5ff7739cded99eb4af3f197586da23314f..acb38ede6737ee6ce32361ec9274f6868f77bc8e 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 f58b4dd2774499e6a8867626f0957334bbf6a2db..f7fee6ba5675c4f74bfd4aaaecdeeb5f657cf6d7 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 103bf8e055a320e73128182566d6458e337f6d75..02b4005c0fb497d13a7fb52856d2bc00a83e5ef1 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 fc1372fbd711fa314e470c9f99a84974b4b7040a..55274b51938be8fdd2b04f2d9306def7c0d8856a 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 0fda9c8babf0f500a0bcc72a08c8e1b2d3367253..3e5f19244954b7e4657f721ca8018adebe8161c8 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 15c1df4123dff91343b97f82854e65f3fcfc5afc..b55d1d27dc9e6c5c1617f2fd7b4be1e3a4b6a070 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 fb63200e0cccb7af653573d50f540dde0b16cd72..59490ce1d11ff399ea9de7e78843dad584bd5f06 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 483d7c207c00accfbb45347c8ace01e317a3738c..59b62f81466daf1fdf21ae394c03e66d38fc50de 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 88319311fc7a2a1f63f2c81ea5c7d18df0c39bba..f62b1aaa09c4f36f2faccd66b67b7a5e8c07d4e7 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 6dad51e5fef464752ecde6ff1a894c889d952615..7331645b434103dbb7673e2bdff873a2058d0a72 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 f1c45f680391c00374f92e3f4281ff079bdf84c9..de16f7a5da5490883b92dae104d1a7fac105efde 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 508e603514f4cba16369c4bc5fb6370623e79396..64cafcb29c654c00013de766bbf62827ac9eb57d 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 2dc16f672c6b4048b245ebfd188bf4c2d3b226b9..aee024ff0858979ef59f27689465005d196d9939 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 d67ddf35a724d682a351b1a82dadf5f859d8c820..f5b83afc57730648baed2007b5b8254fe22a0cf4 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 f1030a4421d4999c31d115ec129a475f8a1cf93e..8005c21d72eb9b0b838d230f8e566e4c8544b209 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 929287b6c0936e036070b5f09b210a6f204cdeee..25e48fd8b9ee85520c223699d33c908ec91bdd3c 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 682b462cb1d6c04778360ee0320b1f0e262da575..870a8e1f0dfb295417fc872668408fc1b4f5d1f6 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 5ee1b8008d7762c8f08fb73bef1be0cdf124f010..c4b76b85e8edc76877b846b4b2ef205b3ea36112 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 d80395415dc3232238c8c57351e931e36f1ddeda..64ced75d9e30fbb0d58938d7bcf1a118e3acc817 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 f7e466e2ec6da9080dbd43d9e09f141ec4c7f3b8..f1ad0ba15a0f37b013d83566020c38bea42e81da 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 c422c3dee2dbcbb56405c301ac5e1f65b3ba8ca5..91ed61dfe9ba594404cbed223dc3ec5c59126a52 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 50ab53ce795ad94d773400c3040ab1bb99d31c42..396ee3f06a4c23c888ce45f150a5abebe28046e2 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 6f632b109d4c952a855cdc9f9dfda241906628b5..82135032a96ba172e45d15772582fb897def8930 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 d0d8d94d57d41cb2780cd095ac757832d8b6e01e..6a01f3e3bb6b8da40e7d9ecc304189944f6e541f 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 5aae63977e08ef1d029a274dab411b5817afff29..ed8a26dc799c41038a6e283b6af20107df1a7f18 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 b039f8b7dc835babe823aa90a6683f69bd31cd7c..d780c4942577f3cca6604154ffad220b53502fbf 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 9183a59f55b0c2f520754568be1d26653eb3e939..a847c133cbdc2536fb56a83ff100523196805264 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 35926d86892e9aa8919a77ccec114978d6d2564c..8873342bed110a67f6b2fee7d1c652f02e6c894b 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 cd284558dd39e90506c55be707bba19169f421e8..f141e48392aad01e187493b6f10338e07940c35c 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 3301988819c19a2984efc9e2d79a7b77e67c2782..a478afbee706d822d9057348acecc1e32a0fd06f 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 e650679325bdb9288231394eefb9198e4d5bc99d..2ac186e3dd5c6f274d237bdd35819874b5c3ae4c 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 438a863ebcb3ba5221e4fcff37cc335fbd44fd73..e91f23f3edd7530ac663bd15fa43d844e9c0eb1a 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 366324508b48cee1b666ca2e2013115ddc5270ea..983cb3b93f06dd004e8f03407f096e0aac50ab5a 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 de848dce39cf333e68bd6042e19e779a83a2bae2..3f1b045a09c42715fee3b56f28dc7b3ad6af631d 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 0721d7ac2bbee03f8f5d1727ae3ac840f28c4199..8b9af62fb8e52a67215644d791cec71b9a1622c2 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 37f37e68296493f7ddb57d93feb901b1dc8284b8..24fa9f074ee6dd48ac9821ffebafd0f3f861cd3a 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 8b3b386e4d693a0637a6590a907d261fe3308000..5ce239b374ba60e433f6c25908cde11dd8c35a83 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 ffd64d263d317a07726bb828e573ce73ce422d61..fd9c07022a18cf1211eaf270e1f325cfd3aab454 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 da695ab31860235652f1395cc1dc1c7797816215..38bcd4e1dd7e0a237435b82b7a9a9f48c10c38c3 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 c584b12c506d61d23d3049612fe369d6b7ca8d9b..48f87e7ad56444f5aa28958b72bc65bcb0bcf648 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 3dfa55ec06579076b9d34c0417855dbd855ca14f..162de98f586646455beb479c678bd331daf3f718 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 1a2fe234a94ecc5d04a778f58bdc8fab8042b21e..4ac671c9fcb30a0e5dae31f7d5ee200317ff378f 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 3812d7a9f61f2f6244a147d036c81711fc82ed10..a070e4c23f5265edd080fc2fd579bf5fcdda6cdb 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 ed9078332a679f00c6067b9a76d73cff8c11871b..25c0158601c9ff31f8ad58228e61df9431ff3f30 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 93e70a0946e4b89d8ba99d9a677a61505f317ff2..5016296c9ae3f3ff4bd451b5a061d2ea935068c6 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 c1c8f3f372acd8e4e4b089edd490787de29cb0ba..3e775555a358556a5f09aae67cc68a890ca37d54 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 4841bfac90a2e0d7e680ec9a902a9edfc1b0ab8a..a58b6c81f89027faeb11f69b2c3a54f4c5112286 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 6c4037dfe273c16bc56fbb3bee30408f82466b24..d8707d6bcade9da4f2f82581517d08ab1995b720 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 7b61d2e02822ee72b12cd4d84ae52175fbcc7be8..8a8d037d4071231cbe9380f1f91705276c3731e9 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 1814eba5304d3a70fac24b093d93a9c3b78e33a7..56e1cf0e9c27a159862e941dde64adf0cc526bf6 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 4140a9418d313d9c87daedf0e907a0c7a4dfef63..4c23b7355f98190920ee9d488b8370c36914b827 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 4a0138490ae4bc7b9e8b37193ffa92c58a007206..a7c759de3366c75762e694625b6028f612080a9d 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 2b2beb130f9ed57a9530ae36def78bcf18b23a75..336e37e56b1a0426ba0382239e33f6c910da5002 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 454a300dd154e4a776b6c2ae51a3e0158418df02..d82d0820c6786ce5badecdb7e56a652af25d0642 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 00e9ad35d2442ea80b469aae3ed9eb156363c555..2319fe4840f8e92acc9ef64405a1f9099883b37e 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 b2ca14c614845f8774f7745145994d294fa177e1..4a288bded27c80a53a884e115914eabdb75a314b 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 0cfc8ed8128ea5e4436d03d8450f2fb022a9ae40..fc6abcd88c43750cd08421a83e17d1a991373372 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 f467087edaef7fd9ebee5c9832c791abdfd06931..51c33def7dac9eba14d983b59f73b1eda99b49fa 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 8255e52960527b80af9de0e145e1e399f845b4b0..8094515c78021864a28da1701b6029120a48046f 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 a576802e53f6c261645ed23546445c7aa1e58236..7e2ae048d67d5522130961950847bfad490300eb 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 6cf672ad43f23d2d845d95f1ec949daeebfc302f..376b62d6d6168891bd4a1d13e2efbca1d91c1aa0 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 922961389afcf2950ba2783bd27ca1e1a32d3880..6bdba4f1c2ca4d3570be902d09866a3711b9f2d0 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 cf25644678dc701b3663970ee2dba2e955f3f168..099354c6e2b61ae9fb975d88788ced5be897b79a 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 b7314b7f55b617c523905816b632e696326b0b20..cd2948a24066aa0f34ad9ec28e03369e2e7c18d9 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 cc6b84611f4a9380ae58c8ed2dbc605d537510f4..5a01883692da598723e9a27a6832cd38f6978041 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 fa9697729605661965a784f86db05cc121a8f2dd..a607dc6c6f28a05999be16b467990b18a0349760 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 bbe5eae22d7b173b9706377222dee7980d014437..4508d9d742b663805dc0c5ff02077b74562d98cc 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 923a3354a622d573d425201a1faec224c5d0e806..db78111ee04797a80efda353c07753971dfecddf 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 642d7551bfca5a85a25365646794baadc3728ca0..d3dc78991bdc2fe319ff450bcbdd5ddcf016a4f2 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 abe04e2b7682f8b69f34b1ccb17df185209bf677..6198153ede67be7806dbd5f7606ad4fba6e7d34a 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 9bbd59392eceb72c8f7ca7c996723f3dedf48a8a..50e1630f403f63c35ef4a69b5fb455c488bf7b13 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 87349cb4cf6e8f70ac381bd2887e8565b55a7f2f..c3a3e5a39b756586fceb52feda7e154db400d585 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 995aeb437559b31f0f8298ca7b6deb82ceeb1bb8..c9204cf36760c9934148c74308ed6ff17c8bb7c7 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 3a3e8913a4262838b3f730e709699828b928c1ad..5252cb0910963e197de8bcc61965e18ecdb88873 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 8a90e7483c721b051f7034cea747096020592b2a..f40edbfeca56b2ca099e8105f0a4c7ba99c65371 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 5cf0ee999690ccd86e87a15c5d209ef1960d74a2..9b2a928561cedc36a35710d027c8b5250f2cc6a8 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 d495a7688bf207a6356e7d1c802a5e28054b297b..19fe5dd16d667cbe286ce0fc66d97b2540c3ea2e 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 7619586950f3aaeb99b7a07fac2fc6cf69221f4a..38f5720979dad7cd46deee62e89390ee28719a68 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 bd2634a98fc1e044761b7a89b875ac1cea87b34e..b346a0b9448bb8cf287f825d53fa487be696086c 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 38ba67857f6a2d0e82c5a7c0670619a6827dbc9f..9334c08be4a9b5b5577b5a88e6f6557512dda094 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 aef3f9e1381379228355e8716bd47d4d2a7d0fe2..4caa62bff66ae0e136351d6259ec2bfb21ad8e81 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 c76ee019d6fb123b30f964e70831138c57fad905..03307bd4df47f15e934fd7a8c768133f531dc712 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 bfd7b9aaa90538dc3d5395f2354e325042f02120..d96089cbf37113867361cb371c3b87f34cb172af 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 d2cc76644bfbbb7ef3bf37d07f6f5eb09d0f3477..d1274068b0748e98231732e7c3bf779df22f7996 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 34abac45e1da164152ccee6ae7e109c2f6017d46..6f4735f3d6448b0642c5331405992dd8ad196a05 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 d00caef7e7322c4e70f253e21b863d5c94048c87..3ef39248d6bbfacb542fe9055791d00c73b66138 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 a7701fbf6434924b15d5881196ed6aeacdaa6e09..c3794e15f603508e82fcea855f32da8760901d40 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 cb752d3ca4d4ec76c273935dc9662ec9f254e849..823d20a5373a62f0a8a9734d99a63304200c442d 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 eebd0168027e3ef8f16c34aa737a394a04337c58..02096efaad4868a8ca0b6ecfa8e79e270f409cd2 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 1732669998de2abe974e0917612dbea7deb4a8a6..06e41a9acc956b8d4513ba9084ff3b3a30e0a5d2 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 2f8d07fda0526ffa952c183872c4bcd0f7143a1c..19563650d8f55750e7f6071b5ef5f34542e894d1 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 b8255232dfd49ac9e60bbffde8ec83ed50830eae..98d91a866194da6a070d9f5dc23cb0bea5b37668 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 b5f0e4d94cdefc3319b3ae453c2b87bd2091fe2e..16a7b8b0d239e51229b10958e4d3808fd2fe9906 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 892acaf79959c544d0adf356f452a3abbb3e54b1..cb495d51b961a9ba5cb08a7145db11fafd3f1851 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 b0822d17dc4314a6effa8d886349316b64439491..fd800828fb4c3b4e3aa66f5a664e98e8ce338e42 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 f1e7679d30777afcdad5541c1c017d5cb8e456bf..1e461a17291e8fff1d4b8f2f2be02da394710cb3 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 4717c073752be42c4090bbbff25fa3ec5450981f..8a2bf0a1b775e7e07c64a81bf4723120daf20e82 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 1c8c09c6003f874357c240e67836bb830735c402..9fc6795c7ad802174954d7b17428cdf6032eca84 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 318b26868d6798732582963ffac685bfd4b0eb3f..319fca4f2edb0b9712ab14204f0ceb23d6b37b0d 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 e8eed1d7f98e890ea3da3a1a0356473876a54f51..8f5e5e20015b8aa01cad146434a0d0f0db4ba576 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 bb91f73a84e70237fd4e0ee1663de2b81cbf8207..a9b6347eda62afbab42b583fa2d62af730d009ca 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 b64b220d6eef9b3e6846ed1ecc33521da449c4f7..a19b36b6eb59510990fec7bb853cd8147593e28d 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 37407a2d8fce0260f094f21db74fa31962b4c8c7..3dec678447fc3235d08069eb1b9be893acfc156f 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,