From b2fa52d4c92cdca398a1b269891e26806b534748 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Wed, 12 Mar 2025 15:20:32 +0100
Subject: [PATCH] [sophia][esterel1] Add disk by-path
---
.../sites/sophia/clusters/esterel1/esterel1.json | 2 ++
.../sophia/clusters/esterel1/nodes/esterel1-1.json | 12 +++++++++++-
.../sites/sophia/clusters/esterel1/esterel1.yaml | 6 +++++-
.../sites/sophia/clusters/esterel1/nodes.yaml.erb | 4 ++++
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
index d66d9081b69..2fc681f9576 100644
--- a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
@@ -8,6 +8,8 @@
],
"model": "Cluster Model",
+ "nodes_count": 1,
+ "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 2x0GB SSD, 1 x 10Gb Ethernet",
"priority": 197001,
"queues": [
"admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json b/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json
index 08284bd9150..ce5bd2d7cfb 100644
--- a/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json
@@ -105,13 +105,23 @@
"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",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+ "id": "disk1",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
index 9469497d91f..a907cb04de3 100644
--- a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
@@ -33,7 +33,11 @@ nodes:
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:03:00.0-scsi-0:2:0:0" # this path will have to change later.
+ disk1:
+ id: disk1
+ interface: SAS
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
software:
standard-environment: debian11-x64-std # TODO: check that architecture is OK
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb
index c4cf8cc0922..6048d7e052a 100644
--- a/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb
+++ b/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb
@@ -77,4 +77,8 @@ nodes:
storage: SSD # Fake data, will be replaced by g5k-checks
model: unknown # Fake data, will be replaced by g5k-checks
size: 8 # Fake data, will be replaced by g5k-checks
+ disk1:
+ storage: SSD # Fake data, will be replaced by g5k-checks
+ model: unknown # Fake data, will be replaced by g5k-checks
+ size: 8 # Fake data, will be replaced by g5k-checks
<% } %>
--
GitLab