From 4c9af02eafe2d721faaadbf3934e5ab3656e40eb Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Thu, 23 Jan 2025 08:45:52 +0100
Subject: [PATCH] [sophia][esterel41] remove duplicates informations and fix IB
configuration
---
.../sophia/clusters/esterel41/nodes/esterel41-1.json | 10 +++++-----
.../sites/sophia/clusters/esterel41/esterel41.yaml | 6 +-----
.../sites/sophia/clusters/esterel41/esterel41_ib.yaml | 6 +++---
.../sophia/clusters/esterel41/nodes/esterel41-1.yaml | 6 +-----
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
index 0cd93dcaf95..550891defa7 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.json
@@ -225,7 +225,7 @@
{
"device": "ibs3",
"driver": "mlx5_core",
- "enabled": "enabled",
+ "enabled": true,
"firmware_version": "20.42.1000",
"guid": "0x88e9a4ffffb8e5c4",
"interface": "InfiniBand",
@@ -234,8 +234,8 @@
"mac": "88:e9:a4:ff:ff:b8:e5:c4",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": "enabled",
- "mounted": "enabled",
+ "mountable": true,
+ "mounted": true,
"name": "ibs3",
"netmask": "255.255.240.0",
"network_address": "esterel41-1-ibs3.sophia.grid5000.fr",
@@ -297,7 +297,7 @@
"firmware_version": 5.28,
"id": "disk0",
"interface": "SATA",
- "model": "VK000960GXNZB",
+ "model": "VK000480GXNZA",
"size": 479559942144,
"storage": "SSD",
"vendor": "HP"
@@ -308,7 +308,7 @@
"firmware_version": 5.28,
"id": "disk1",
"interface": "SATA",
- "model": "VK000480GXNZA",
+ "model": "VK000960GXNZB",
"size": 2878970265600,
"storage": "SSD",
"vendor": "HP"
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
index 875223ccb2c..ba8debe993b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41.yaml
@@ -42,16 +42,12 @@ nodes:
mountable: false
mounted: false
storage_devices:
- pci-0000:3b:00.0-scsi-0:3:111:0:
+ pci-0000:3b:00.0-scsi-0:3:111:0:
id: disk0
interface: SATA
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
- model: VK000960GXNZB
pci-0000:3b:00.0-scsi-0:3:110:0:
id: disk1
interface: SATA
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:110:0"
- model: VK000480GXNZA
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
index c5f800f066c..62bfd70e4f3 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/esterel41_ib.yaml
@@ -3,7 +3,7 @@ nodes:
esterel41-1:
network_adapters:
ibs3:
- enabled: enabled
- mountable: enabled
- mounted: enabled
+ enabled: true
+ mountable: true
+ mounted: true
netmask: 255.255.240.0
diff --git a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
index d118d0d13d9..5184012ca96 100644
--- a/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel41/nodes/esterel41-1.yaml
@@ -140,8 +140,8 @@ esterel41-1:
firmware_version: 20.42.1000
guid: '0x88e9a4ffffb8e5c4'
interface: InfiniBand
+ ip: '172.18.131.56'
mac: 88:e9:a4:ff:ff:b8:e5:c4
- ip: "172.18.131.56"
management: false
model: MT28908 Family [ConnectX-6]
name: ibs3
@@ -174,8 +174,6 @@ esterel41-1:
model: VK000960GXNZB
size: 2878970265600
storage: SSD
- id: disk1
- interface: SATA
pci-0000:3b:00.0-scsi-0:3:111:0:
by_id: "/dev/disk/by-id/wwn-0x600062b21bb919402f17a4754a47ba20"
by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:3:111:0"
@@ -183,7 +181,5 @@ esterel41-1:
model: VK000480GXNZA
size: 479559942144
storage: SSD
- id: disk0
- interface: SATA
supported_job_types:
virtual: false
--
GitLab