From 3d55295b03e403510b6cad1d4a499db89dbcd621 Mon Sep 17 00:00:00 2001
From: Philippe Virouleau <philippe.virouleau@inria.fr>
Date: Wed, 8 Nov 2023 10:11:59 +0100
Subject: [PATCH] [roazhon11] try to fix the interface
---
.../clusters/roazhon11/nodes/roazhon11-1.json | 30 +++++++++----------
.../clusters/roazhon11/nodes/roazhon11-2.json | 30 +++++++++----------
.../clusters/roazhon11/nodes/roazhon11-3.json | 30 +++++++++----------
input/grid5000/ipv4.yaml | 2 +-
.../clusters/roazhon11/nodes/roazhon11-1.yaml | 4 +--
.../clusters/roazhon11/nodes/roazhon11-2.yaml | 4 +--
.../clusters/roazhon11/nodes/roazhon11-3.yaml | 4 +--
.../rennes/clusters/roazhon11/roazhon11.yaml | 4 +--
lib/refrepo/net_names_mapping.yaml | 4 +--
9 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.json b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.json
index 8eed146da4d..4755aca937e 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.json
@@ -111,19 +111,7 @@
],
"network_adapters": [
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.110.37",
- "kavlan": false,
- "mac": "84:8f:69:ff:92:a6",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "roazhon11-1-bmc.rennes.grid5000.fr"
- },
- {
- "device": "eno1",
+ "device": "eth0",
"driver": "igb",
"enabled": true,
"firmware_version": "1.57.0",
@@ -137,7 +125,7 @@
"mountable": true,
"mounted": true,
"name": "eno1",
- "network_address": "roazhon11-1-eno1.rennes.grid5000.fr",
+ "network_address": "roazhon11-1.rennes.grid5000.fr",
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
@@ -146,7 +134,7 @@
"vendor": "Intel"
},
{
- "device": "eno2",
+ "device": "eth1",
"driver": "igb",
"enabled": false,
"firmware_version": "1.57.0",
@@ -161,6 +149,18 @@
"sriov": true,
"sriov_totalvfs": 7,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.110.37",
+ "kavlan": false,
+ "mac": "84:8f:69:ff:92:a6",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "roazhon11-1-bmc.rennes.grid5000.fr"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.json b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.json
index 4d15608f477..360aba420fe 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.json
@@ -111,19 +111,7 @@
],
"network_adapters": [
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.110.38",
- "kavlan": false,
- "mac": "84:8f:69:ff:93:00",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "roazhon11-2-bmc.rennes.grid5000.fr"
- },
- {
- "device": "eno1",
+ "device": "eth0",
"driver": "igb",
"enabled": true,
"firmware_version": "1.57.0",
@@ -137,7 +125,7 @@
"mountable": true,
"mounted": true,
"name": "eno1",
- "network_address": "roazhon11-2-eno1.rennes.grid5000.fr",
+ "network_address": "roazhon11-2.rennes.grid5000.fr",
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
@@ -146,7 +134,7 @@
"vendor": "Intel"
},
{
- "device": "eno2",
+ "device": "eth1",
"driver": "igb",
"enabled": false,
"firmware_version": "1.57.0",
@@ -161,6 +149,18 @@
"sriov": true,
"sriov_totalvfs": 7,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.110.38",
+ "kavlan": false,
+ "mac": "84:8f:69:ff:93:00",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "roazhon11-2-bmc.rennes.grid5000.fr"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.json b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.json
index 77ebea72adf..5d4a963f8b8 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.json
@@ -111,19 +111,7 @@
],
"network_adapters": [
{
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.110.39",
- "kavlan": false,
- "mac": "78:45:c4:f8:f9:02",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "roazhon11-3-bmc.rennes.grid5000.fr"
- },
- {
- "device": "eno1",
+ "device": "eth0",
"driver": "igb",
"enabled": true,
"firmware_version": "1.57.0",
@@ -137,7 +125,7 @@
"mountable": true,
"mounted": true,
"name": "eno1",
- "network_address": "roazhon11-3-eno1.rennes.grid5000.fr",
+ "network_address": "roazhon11-3.rennes.grid5000.fr",
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
@@ -146,7 +134,7 @@
"vendor": "Intel"
},
{
- "device": "eno2",
+ "device": "eth1",
"driver": "igb",
"enabled": false,
"firmware_version": "1.57.0",
@@ -161,6 +149,18 @@
"sriov": true,
"sriov_totalvfs": 7,
"vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.110.39",
+ "kavlan": false,
+ "mac": "78:45:c4:f8:f9:02",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "roazhon11-3-bmc.rennes.grid5000.fr"
}
],
"operating_system": {
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 38d407b490b..29e85616268 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -101,7 +101,7 @@ ipv4:
rennes roazhon8 eth0 0 0 14 24
rennes roazhon9 eth0 0 0 14 28
rennes roazhon10 eth0 0 0 14 32
- rennes roazhon11 eno1 0 0 14 36
+ rennes roazhon11 eth0 0 0 14 36
rennes roazhon12 eth0 0 0 14 39
rennes roazhon13 eth0 0 0 14 44
sophia uvb eth0 0 0 4 0
diff --git a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.yaml b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.yaml
index 4e3e892e0cb..2ead0f543c4 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-1.yaml
@@ -72,7 +72,7 @@ roazhon11-1:
ip: 172.17.110.37
mac: 84:8f:69:ff:92:a6
management: true
- eno1:
+ eth0:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
@@ -85,7 +85,7 @@ roazhon11-1:
sriov: true
sriov_totalvfs: 7
vendor: Intel
- eno2:
+ eth1:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
diff --git a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.yaml b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.yaml
index 71e9971a3c7..3f8c4b06b04 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-2.yaml
@@ -72,7 +72,7 @@ roazhon11-2:
ip: 172.17.110.38
mac: 84:8f:69:ff:93:00
management: true
- eno1:
+ eth0:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
@@ -85,7 +85,7 @@ roazhon11-2:
sriov: true
sriov_totalvfs: 7
vendor: Intel
- eno2:
+ eth1:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
diff --git a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.yaml b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.yaml
index 228307b4d24..bc0681e010a 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon11/nodes/roazhon11-3.yaml
@@ -72,7 +72,7 @@ roazhon11-3:
ip: 172.17.110.39
mac: 78:45:c4:f8:f9:02
management: true
- eno1:
+ eth0:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
@@ -85,7 +85,7 @@ roazhon11-3:
sriov: true
sriov_totalvfs: 7
vendor: Intel
- eno2:
+ eth1:
driver: igb
firmware_version: 1.57.0
interface: Ethernet
diff --git a/input/grid5000/sites/rennes/clusters/roazhon11/roazhon11.yaml b/input/grid5000/sites/rennes/clusters/roazhon11/roazhon11.yaml
index a1e6772d8c2..ae8df07dee6 100644
--- a/input/grid5000/sites/rennes/clusters/roazhon11/roazhon11.yaml
+++ b/input/grid5000/sites/rennes/clusters/roazhon11/roazhon11.yaml
@@ -25,11 +25,11 @@ nodes:
enabled: true
mountable: false
mounted: false
- eno1:
+ eth0:
enabled: true
mountable: true
mounted: true
- eno2:
+ eth1:
enabled: false
mountable: false
mounted: false
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index dc006740fb1..77f1b3b7f27 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -242,8 +242,8 @@ roazhon10:
enp59s0f0: eth0
enp59s0f1: eth1
roazhon11:
- enp2s0f0: eth0
- enp2s0f3: eth1
+ eno1: eth0
+ eno2: eth1
roazhon13:
enp24s0f0: eth0
enp24s0f1: eth1
--
GitLab