From 392b9163fcb3ec7f4d612ec3215a1aa66f202d53 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Fri, 13 Oct 2023 14:06:04 +0200
Subject: [PATCH] [abacus3] add disk by_path
---
.../clusters/abacus3/nodes/abacus3-1.json | 20 +------------------
.../rennes/clusters/abacus3/abacus3.yaml | 14 +------------
2 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/data/grid5000/sites/rennes/clusters/abacus3/nodes/abacus3-1.json b/data/grid5000/sites/rennes/clusters/abacus3/nodes/abacus3-1.json
index 97428f6c3e4..31aeb958f42 100644
--- a/data/grid5000/sites/rennes/clusters/abacus3/nodes/abacus3-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus3/nodes/abacus3-1.json
@@ -74,30 +74,12 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"storage": "SSD",
"vendor": "Unknown"
- },
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
- "id": "disk1",
- "interface": "SATA",
- "model": "unknown",
- "storage": "HDD",
- "vendor": "Unknown"
- },
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
- "id": "disk2",
- "interface": "NVME",
- "model": "unknown",
- "storage": "SSD",
- "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/input/grid5000/sites/rennes/clusters/abacus3/abacus3.yaml b/input/grid5000/sites/rennes/clusters/abacus3/abacus3.yaml
index 7a258ce17d0..04fed94b896 100644
--- a/input/grid5000/sites/rennes/clusters/abacus3/abacus3.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus3/abacus3.yaml
@@ -55,16 +55,4 @@ nodes:
interface: SAS
storage: SSD
model: unknown
- by_path: "/dev/disk/by-path/dummy"
- disk1:
- id: disk1
- interface: SATA
- storage: HDD
- model: unknown
- by_path: "/dev/disk/by-path/dummy"
- disk2:
- id: disk2
- interface: NVME
- storage: SSD
- model: unknown
- by_path: "/dev/disk/by-path/dummy"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
--
GitLab