From 92d2c84dcb4b1995173c06f8f807bed3a42ba8fe Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Mon, 20 Jan 2025 13:37:44 +0100
Subject: [PATCH] [sophia][musa] force musa-[3-4] eth0 naming as other nodes
---
data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json | 2 +-
data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json | 2 +-
input/grid5000/sites/sophia/clusters/musa/nodes/musa-3.yaml | 2 +-
input/grid5000/sites/sophia/clusters/musa/nodes/musa-4.yaml | 2 +-
lib/refrepo/net_names_mapping.yaml | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index 673ee53812a..2fd794f5969 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -162,7 +162,7 @@
"model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
- "name": "ens22f0np0",
+ "name": "enp1s0f0np0",
"network_address": "musa-3.sophia.grid5000.fr",
"rate": 25000000000,
"sriov": false,
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index 84a158fed84..9ef95aa3c19 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -162,7 +162,7 @@
"model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
- "name": "ens22f0np0",
+ "name": "enp1s0f0np0",
"network_address": "musa-4.sophia.grid5000.fr",
"rate": 25000000000,
"sriov": false,
diff --git a/input/grid5000/sites/sophia/clusters/musa/nodes/musa-3.yaml b/input/grid5000/sites/sophia/clusters/musa/nodes/musa-3.yaml
index 1454660f2fd..b12abe44bbe 100644
--- a/input/grid5000/sites/sophia/clusters/musa/nodes/musa-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/musa/nodes/musa-3.yaml
@@ -97,7 +97,7 @@ musa-3:
mac: 6c:92:cf:b9:5e:e8
management: false
model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
- name: ens22f0np0
+ name: enp1s0f0np0
rate: 25000000000
sriov: false
sriov_totalvfs: 0
diff --git a/input/grid5000/sites/sophia/clusters/musa/nodes/musa-4.yaml b/input/grid5000/sites/sophia/clusters/musa/nodes/musa-4.yaml
index 695e9d327bc..8acb0b41370 100644
--- a/input/grid5000/sites/sophia/clusters/musa/nodes/musa-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/musa/nodes/musa-4.yaml
@@ -97,7 +97,7 @@ musa-4:
mac: 6c:92:cf:b9:13:2e
management: false
model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
- name: ens22f0np0
+ name: enp1s0f0np0
rate: 25000000000
sriov: false
sriov_totalvfs: 0
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index f0a1f119fa6..cc9290bd701 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -211,7 +211,6 @@ montcalm:
ens10f0np0: eth0
ens10f1np1: eth1
musa:
- ens22f0np0: eth0
enp1s0f0np0: eth0
ens22f1np1: eth1
nessie:
--
GitLab