From 4e118913d910c8b1caa9435b92921193f738ac07 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Wed, 26 Jun 2024 15:02:57 +0200
Subject: [PATCH] [strasbourg][fleckenstein] Redistribute disks on fleckenstein
 cluster.

---
 .../fleckenstein/nodes/fleckenstein-1.json    | 23 +++++--------------
 .../fleckenstein/nodes/fleckenstein-10.json   | 11 ---------
 .../fleckenstein/nodes/fleckenstein-2.json    | 17 +++-----------
 .../fleckenstein/nodes/fleckenstein-3.json    | 17 +++-----------
 .../fleckenstein/nodes/fleckenstein-4.json    | 11 ---------
 .../fleckenstein/nodes/fleckenstein-5.json    | 23 +++++--------------
 .../fleckenstein/nodes/fleckenstein-6.json    | 17 +++-----------
 .../fleckenstein/nodes/fleckenstein-7.json    | 23 +++++--------------
 .../fleckenstein/nodes/fleckenstein-8.json    | 17 +++-----------
 .../fleckenstein/nodes/fleckenstein-9.json    | 11 ---------
 .../clusters/fleckenstein/fleckenstein.yaml   |  3 ---
 .../fleckenstein/nodes/fleckenstein-1.yaml    | 19 +++++----------
 .../fleckenstein/nodes/fleckenstein-10.yaml   |  7 ------
 .../fleckenstein/nodes/fleckenstein-2.yaml    | 13 +++--------
 .../fleckenstein/nodes/fleckenstein-3.yaml    | 13 +++--------
 .../fleckenstein/nodes/fleckenstein-4.yaml    |  7 ------
 .../fleckenstein/nodes/fleckenstein-5.yaml    | 19 +++++----------
 .../fleckenstein/nodes/fleckenstein-6.yaml    | 13 +++--------
 .../fleckenstein/nodes/fleckenstein-7.yaml    | 19 +++++----------
 .../fleckenstein/nodes/fleckenstein-8.yaml    | 13 +++--------
 .../fleckenstein/nodes/fleckenstein-9.yaml    |  7 ------
 21 files changed, 60 insertions(+), 243 deletions(-)

diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 0bd3590511f..a6d78536e07 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe95",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4908df",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac005",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491efb",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abc6d",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 28b3af7a2cf..3703479ab62 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da49095f",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 4dbe803660f..8b3921bfebb 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4908df",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac0b9",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491efb",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 7847c4c8cd9..2403a714903 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4914c3",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe5d",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490b1f",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index 80e77c658a8..e06c2768602 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491827",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 82fb6a9d32f..a28e083fbcf 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c18201e2d",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4914c3",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abd91",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490b1f",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c1820250d",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index a29fb3ada91..ee5f6287b41 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4916c3",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abf85",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490e87",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 96375a6d461..4cf986b303a 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac159",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4916c3",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac015",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4920a7",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abf85",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 523f3010fac..f2c6e296734 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490927",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac159",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491b2b",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index ac786298313..6c940bc64b7 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac0b9",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
index e7e662e46ba..d48f103e389 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
@@ -61,9 +61,6 @@ nodes:
       pci-0000:47:00.0-scsi-0:2:4:0:
         id: disk3
         interface: SAS
-      pci-0000:47:00.0-scsi-0:2:5:0:
-        id: disk4
-        interface: SAS
     software:
       standard-environment: debian11-x64-std
     management_tools:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
index ada63f8fbd3..762beaa78b6 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
@@ -170,17 +170,17 @@ fleckenstein-1:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abe95"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4908df"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac005"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da491efb"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-1:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abc6d"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
index f2dada96e1c..9617a7942dc 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
@@ -190,12 +190,5 @@ fleckenstein-10:
       model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da49095f"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
index 9386522a22c..f9b5059fe10 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
@@ -184,17 +184,10 @@ fleckenstein-2:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4908df"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac0b9"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491efb"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
index f1cbcfff70c..1aa4301615d 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
@@ -184,17 +184,10 @@ fleckenstein-3:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4914c3"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084abe5d"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490b1f"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
index 321e0f8feb6..5bb79af00be 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
@@ -190,12 +190,5 @@ fleckenstein-4:
       model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491827"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
index fba155fe06d..426227a2b57 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
@@ -170,17 +170,17 @@ fleckenstein-5:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c18201e2d"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4914c3"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abd91"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da490b1f"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-5:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c1820250d"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
index 53dc4b21b8e..135fb56cc74 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
@@ -184,17 +184,10 @@ fleckenstein-6:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4916c3"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084abf85"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490e87"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
index 601ba1f38db..4107b8d7d92 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
@@ -170,17 +170,17 @@ fleckenstein-7:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac159"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4916c3"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac015"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4920a7"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-7:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abf85"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
index 5f482d6063c..8bccd221412 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
@@ -184,17 +184,10 @@ fleckenstein-8:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490927"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac159"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491b2b"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
index c6773761b3f..5bd318c4c41 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
@@ -190,12 +190,5 @@ fleckenstein-9:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac0b9"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
-- 
GitLab