From 2735ca2b6088c37162f30072b6bf1f72100d7e88 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 7 May 2025 15:26:10 +0200
Subject: [PATCH] [rennes][roazhon14] Add disk by-path

---
 .../rennes/clusters/roazhon14/nodes/roazhon14-1.json     | 9 ++++++++-
 .../rennes/clusters/roazhon14/nodes/roazhon14-2.json     | 9 ++++++++-
 .../rennes/clusters/roazhon14/nodes/roazhon14-3.json     | 9 ++++++++-
 .../rennes/clusters/roazhon14/nodes/roazhon14-4.json     | 9 ++++++++-
 .../sites/rennes/clusters/roazhon14/roazhon14.yaml       | 6 +++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-1.json b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-1.json
index 7c41e978038..4a466cbef8e 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-1.json
@@ -54,6 +54,13 @@
       "switch": null,
       "switch_port": null
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -105,7 +112,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:86:00.0-ata-1.0",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-2.json b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-2.json
index 6dbe708fd04..3dea157a119 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-2.json
@@ -54,6 +54,13 @@
       "switch": null,
       "switch_port": null
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -105,7 +112,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:86:00.0-ata-1.0",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-3.json b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-3.json
index 51ef0de348d..7318af34437 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-3.json
@@ -54,6 +54,13 @@
       "switch": null,
       "switch_port": null
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -105,7 +112,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:86:00.0-ata-1.0",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-4.json b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-4.json
index 7752e8b2b0e..8a7370d95ec 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon14/nodes/roazhon14-4.json
@@ -54,6 +54,13 @@
       "switch": null,
       "switch_port": null
     },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "kavlan": false,
+      "mountable": false,
+      "mounted": false
+    },
     {
       "device": "bmc",
       "enabled": true,
@@ -105,7 +112,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:86:00.0-ata-1.0",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
diff --git a/input/grid5000/sites/rennes/clusters/roazhon14/roazhon14.yaml b/input/grid5000/sites/rennes/clusters/roazhon14/roazhon14.yaml
index e1fdb3f769c..9b59dc170c4 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon14/roazhon14.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon14/roazhon14.yaml
@@ -29,11 +29,15 @@ nodes:
         enabled: true
         mountable: true
         mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
     storage_devices:
       disk0: # This field will have to be renamed later.
         id: disk0
         interface: SAS
-        by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+        by_path: "/dev/disk/by-path/pci-0000:86:00.0-ata-1.0"
     software:
       standard-environment: debian11-x64-std
     management_tools:
-- 
GitLab