From 449579b017b72b3e9ab5e027221c8687b2b8d5a4 Mon Sep 17 00:00:00 2001 From: EISENBART Theo <theo.eisenbart@inria.fr> Date: Thu, 2 Nov 2023 14:43:28 +0100 Subject: [PATCH] [abacus15] Change names interfaces --- .../clusters/abacus15/nodes/abacus15-1.json | 30 +++++++++---------- input/grid5000/ipv4.yaml | 2 +- .../rennes/clusters/abacus15/abacus15.yaml | 4 +-- .../clusters/abacus15/nodes/abacus15-1.yaml | 4 +-- lib/refrepo/net_names_mapping.yaml | 4 +-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.json b/data/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.json index da522917a8a..e24dc4bf874 100644 --- a/data/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.json +++ b/data/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.json @@ -161,19 +161,7 @@ ], "network_adapters": [ { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.109.15", - "kavlan": false, - "mac": "f4:02:70:b3:e4:9a", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "abacus15-1-bmc.rennes.grid5000.fr" - }, - { - "device": "eno1", + "device": "eth0", "driver": "i40e", "enabled": true, "firmware_version": "9.20 0x8000d969 22.0.9", @@ -187,7 +175,7 @@ "mountable": true, "mounted": true, "name": "eno1", - "network_address": "abacus15-1-eno1.rennes.grid5000.fr", + "network_address": "abacus15-1.rennes.grid5000.fr", "rate": 10000000000, "sriov": false, "sriov_totalvfs": 0, @@ -196,7 +184,7 @@ "vendor": "Intel" }, { - "device": "eno2", + "device": "eth1", "driver": "i40e", "enabled": false, "firmware_version": "9.20 0x8000d969 22.0.9", @@ -211,6 +199,18 @@ "sriov": false, "sriov_totalvfs": 0, "vendor": "Intel" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.109.15", + "kavlan": false, + "mac": "f4:02:70:b3:e4:9a", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "abacus15-1-bmc.rennes.grid5000.fr" } ], "operating_system": { diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index 402c5c37aa4..29e85616268 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -82,7 +82,7 @@ ipv4: rennes abacus12 eth0 0 0 13 11 rennes abacus13 eth0 0 0 13 12 rennes abacus14 eth0 0 0 13 13 - rennes abacus15 eno1 0 0 13 14 + rennes abacus15 eth0 0 0 13 14 rennes abacus16 eth0 0 0 13 15 rennes abacus17 eth0 0 0 13 16 rennes abacus18 eth0 0 0 13 17 diff --git a/input/grid5000/sites/rennes/clusters/abacus15/abacus15.yaml b/input/grid5000/sites/rennes/clusters/abacus15/abacus15.yaml index fe5731a6186..c7c20dc62ab 100644 --- a/input/grid5000/sites/rennes/clusters/abacus15/abacus15.yaml +++ b/input/grid5000/sites/rennes/clusters/abacus15/abacus15.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/input/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.yaml b/input/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.yaml index 2d45637b90b..d96f0cb716e 100644 --- a/input/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.yaml +++ b/input/grid5000/sites/rennes/clusters/abacus15/nodes/abacus15-1.yaml @@ -93,7 +93,7 @@ abacus15-1: ip: 172.17.109.15 mac: f4:02:70:b3:e4:9a management: true - eno1: + eth0: driver: i40e firmware_version: 9.20 0x8000d969 22.0.9 interface: Ethernet @@ -106,7 +106,7 @@ abacus15-1: sriov: false sriov_totalvfs: 0 vendor: Intel - eno2: + eth1: driver: i40e firmware_version: 9.20 0x8000d969 22.0.9 interface: Ethernet diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index 01c1dd28257..fd616f7cc7d 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -25,8 +25,8 @@ abacus10: eno1np0: eth2 eno2np1: eth3 abacus15: - enp5s0f0: eno1 - enp5s0f1: eno2 + eno1: eth0 + eno2: eth1 abacus16: eno1: eth0 eno2: eth1 -- GitLab