From ca85ac940621204928c71125b7382b123775ec79 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Wed, 5 Mar 2025 10:32:13 +0100
Subject: [PATCH 1/2] [Grenoble][Chartreuse2] Add configuration for kavlan
---
.../clusters/chartreuse2/chartreuse2.json | 2 +-
.../chartreuse2/nodes/chartreuse2-1.json | 46 ++++++++++++++++++-
.../chartreuse2/nodes/chartreuse2-2.json | 46 ++++++++++++++++++-
.../chartreuse2/nodes/chartreuse2-3.json | 46 ++++++++++++++++++-
.../chartreuse2/nodes/chartreuse2-4.json | 46 ++++++++++++++++++-
.../clusters/chartreuse2/chartreuse2.yaml | 2 +-
input/grid5000/vlans.yaml | 6 +++
7 files changed, 188 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
index 3245c28e400..85ae9708186 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
@@ -2,7 +2,7 @@
"boot_type": "bios",
"created_at": "Mon, 13 Jan 2025 00:00:00 GMT",
"exotic": false,
- "kavlan": false,
+ "kavlan": true,
"manufactured_at": "2016-11-14",
"metrics": [
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
index bba5cb03eed..7b232c41372 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -20,6 +20,50 @@
"warranty_end": "2021-11-13"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.1",
+ "kavlan-11": "10.7.247.1",
+ "kavlan-12": "10.11.247.1",
+ "kavlan-13": "10.15.247.1",
+ "kavlan-14": "10.19.247.1",
+ "kavlan-16": "10.27.247.1",
+ "kavlan-17": "10.31.247.1",
+ "kavlan-18": "10.35.247.1",
+ "kavlan-2": "192.168.214.1",
+ "kavlan-20": "10.43.247.1",
+ "kavlan-21": "10.47.247.1",
+ "kavlan-3": "192.168.230.1",
+ "kavlan-4": "10.4.6.1",
+ "kavlan-5": "10.4.70.1",
+ "kavlan-6": "10.4.134.1",
+ "kavlan-7": "10.4.198.1",
+ "kavlan-8": "10.5.6.1",
+ "kavlan-9": "10.5.70.1"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::5",
+ "kavlan-11": "2001:660:4406:1a0:10b::5",
+ "kavlan-12": "2001:660:4406:2a0:10b::5",
+ "kavlan-13": "2001:660:4406:4a0:10b::5",
+ "kavlan-14": "2001:660:4406:5a0:10b::5",
+ "kavlan-16": "2001:660:4406:7a0:10b::5",
+ "kavlan-17": "2001:660:4406:9a0:10b::5",
+ "kavlan-18": "2001:660:4406:8a0:10b::5",
+ "kavlan-2": "2001:660:4406:181:b::5",
+ "kavlan-20": "2001:660:4406:3a0:10b::5",
+ "kavlan-21": "2001:660:4406:6a0:10b::5",
+ "kavlan-3": "2001:660:4406:182:b::5",
+ "kavlan-4": "2001:660:4406:190:b::5",
+ "kavlan-5": "2001:660:4406:191:b::5",
+ "kavlan-6": "2001:660:4406:192:b::5",
+ "kavlan-7": "2001:660:4406:193:b::5",
+ "kavlan-8": "2001:660:4406:194:b::5",
+ "kavlan-9": "2001:660:4406:195:b::5"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.5",
"ip6": "2001:660:4406:100:b::5",
- "kavlan": false,
+ "kavlan": true,
"mac": "7c:d3:0a:bf:38:d4",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
index 3be26f3c4fe..9a6f90181ab 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -20,6 +20,50 @@
"warranty_end": "2021-11-13"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.2",
+ "kavlan-11": "10.7.247.2",
+ "kavlan-12": "10.11.247.2",
+ "kavlan-13": "10.15.247.2",
+ "kavlan-14": "10.19.247.2",
+ "kavlan-16": "10.27.247.2",
+ "kavlan-17": "10.31.247.2",
+ "kavlan-18": "10.35.247.2",
+ "kavlan-2": "192.168.214.2",
+ "kavlan-20": "10.43.247.2",
+ "kavlan-21": "10.47.247.2",
+ "kavlan-3": "192.168.230.2",
+ "kavlan-4": "10.4.6.2",
+ "kavlan-5": "10.4.70.2",
+ "kavlan-6": "10.4.134.2",
+ "kavlan-7": "10.4.198.2",
+ "kavlan-8": "10.5.6.2",
+ "kavlan-9": "10.5.70.2"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::6",
+ "kavlan-11": "2001:660:4406:1a0:10b::6",
+ "kavlan-12": "2001:660:4406:2a0:10b::6",
+ "kavlan-13": "2001:660:4406:4a0:10b::6",
+ "kavlan-14": "2001:660:4406:5a0:10b::6",
+ "kavlan-16": "2001:660:4406:7a0:10b::6",
+ "kavlan-17": "2001:660:4406:9a0:10b::6",
+ "kavlan-18": "2001:660:4406:8a0:10b::6",
+ "kavlan-2": "2001:660:4406:181:b::6",
+ "kavlan-20": "2001:660:4406:3a0:10b::6",
+ "kavlan-21": "2001:660:4406:6a0:10b::6",
+ "kavlan-3": "2001:660:4406:182:b::6",
+ "kavlan-4": "2001:660:4406:190:b::6",
+ "kavlan-5": "2001:660:4406:191:b::6",
+ "kavlan-6": "2001:660:4406:192:b::6",
+ "kavlan-7": "2001:660:4406:193:b::6",
+ "kavlan-8": "2001:660:4406:194:b::6",
+ "kavlan-9": "2001:660:4406:195:b::6"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.6",
"ip6": "2001:660:4406:100:b::6",
- "kavlan": false,
+ "kavlan": true,
"mac": "7c:d3:0a:bf:40:24",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
index 01ad67f0b58..89ee918498c 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -20,6 +20,50 @@
"warranty_end": "2021-11-14"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.3",
+ "kavlan-11": "10.7.247.3",
+ "kavlan-12": "10.11.247.3",
+ "kavlan-13": "10.15.247.3",
+ "kavlan-14": "10.19.247.3",
+ "kavlan-16": "10.27.247.3",
+ "kavlan-17": "10.31.247.3",
+ "kavlan-18": "10.35.247.3",
+ "kavlan-2": "192.168.214.3",
+ "kavlan-20": "10.43.247.3",
+ "kavlan-21": "10.47.247.3",
+ "kavlan-3": "192.168.230.3",
+ "kavlan-4": "10.4.6.3",
+ "kavlan-5": "10.4.70.3",
+ "kavlan-6": "10.4.134.3",
+ "kavlan-7": "10.4.198.3",
+ "kavlan-8": "10.5.6.3",
+ "kavlan-9": "10.5.70.3"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::7",
+ "kavlan-11": "2001:660:4406:1a0:10b::7",
+ "kavlan-12": "2001:660:4406:2a0:10b::7",
+ "kavlan-13": "2001:660:4406:4a0:10b::7",
+ "kavlan-14": "2001:660:4406:5a0:10b::7",
+ "kavlan-16": "2001:660:4406:7a0:10b::7",
+ "kavlan-17": "2001:660:4406:9a0:10b::7",
+ "kavlan-18": "2001:660:4406:8a0:10b::7",
+ "kavlan-2": "2001:660:4406:181:b::7",
+ "kavlan-20": "2001:660:4406:3a0:10b::7",
+ "kavlan-21": "2001:660:4406:6a0:10b::7",
+ "kavlan-3": "2001:660:4406:182:b::7",
+ "kavlan-4": "2001:660:4406:190:b::7",
+ "kavlan-5": "2001:660:4406:191:b::7",
+ "kavlan-6": "2001:660:4406:192:b::7",
+ "kavlan-7": "2001:660:4406:193:b::7",
+ "kavlan-8": "2001:660:4406:194:b::7",
+ "kavlan-9": "2001:660:4406:195:b::7"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.7",
"ip6": "2001:660:4406:100:b::7",
- "kavlan": false,
+ "kavlan": true,
"mac": "7c:d3:0a:bf:41:08",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
index 658fbe0f48e..460b713e37e 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -20,6 +20,50 @@
"warranty_end": "2021-11-13"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.4",
+ "kavlan-11": "10.7.247.4",
+ "kavlan-12": "10.11.247.4",
+ "kavlan-13": "10.15.247.4",
+ "kavlan-14": "10.19.247.4",
+ "kavlan-16": "10.27.247.4",
+ "kavlan-17": "10.31.247.4",
+ "kavlan-18": "10.35.247.4",
+ "kavlan-2": "192.168.214.4",
+ "kavlan-20": "10.43.247.4",
+ "kavlan-21": "10.47.247.4",
+ "kavlan-3": "192.168.230.4",
+ "kavlan-4": "10.4.6.4",
+ "kavlan-5": "10.4.70.4",
+ "kavlan-6": "10.4.134.4",
+ "kavlan-7": "10.4.198.4",
+ "kavlan-8": "10.5.6.4",
+ "kavlan-9": "10.5.70.4"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::8",
+ "kavlan-11": "2001:660:4406:1a0:10b::8",
+ "kavlan-12": "2001:660:4406:2a0:10b::8",
+ "kavlan-13": "2001:660:4406:4a0:10b::8",
+ "kavlan-14": "2001:660:4406:5a0:10b::8",
+ "kavlan-16": "2001:660:4406:7a0:10b::8",
+ "kavlan-17": "2001:660:4406:9a0:10b::8",
+ "kavlan-18": "2001:660:4406:8a0:10b::8",
+ "kavlan-2": "2001:660:4406:181:b::8",
+ "kavlan-20": "2001:660:4406:3a0:10b::8",
+ "kavlan-21": "2001:660:4406:6a0:10b::8",
+ "kavlan-3": "2001:660:4406:182:b::8",
+ "kavlan-4": "2001:660:4406:190:b::8",
+ "kavlan-5": "2001:660:4406:191:b::8",
+ "kavlan-6": "2001:660:4406:192:b::8",
+ "kavlan-7": "2001:660:4406:193:b::8",
+ "kavlan-8": "2001:660:4406:194:b::8",
+ "kavlan-9": "2001:660:4406:195:b::8"
+ }
+ },
"main_memory": {
"ram_size": 34359738368
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.8",
"ip6": "2001:660:4406:100:b::8",
- "kavlan": false,
+ "kavlan": true,
"mac": "7c:d3:0a:bf:3f:ee",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
index a719bea54fb..268192ecfdd 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -1,7 +1,7 @@
---
model: Dell PowerEdge C6320
created_at: 2025-01-13
-kavlan: false
+kavlan: true
boot_type: bios
exotic: false
queues:
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 08aa8f2283f..95ae0f73cdd 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -74,6 +74,8 @@ vlans:
local grenoble kinovis eth0 0 0 5 0
local grenoble kinovis eth1 0 0 5 10
local grenoble kinovis eth2 0 0 5 20
+ local grenoble chartreuse2 eth0 0 0 6 0
+ local grenoble chartreuse2 eth1 0 0 6 10
local lille chifflot eth0 0 0 4 0
local lille chifflot eth1 0 0 5 0
local lille chiclet eth0 0 0 6 0
@@ -290,6 +292,8 @@ vlans:
global grenoble kinovis eth0 0 0 54 0
global grenoble kinovis eth1 0 0 54 10
global grenoble kinovis eth2 0 0 54 20
+ global grenoble chartreuse2 eth0 0 0 55 0
+ global grenoble chartreuse2 eth1 0 0 55 10
routed grenoble yeti eth0 0 4 0 0
routed grenoble dahu eth0 0 4 1 0
routed grenoble troll eth0 0 4 2 0
@@ -300,6 +304,8 @@ vlans:
routed grenoble kinovis eth0 0 4 5 0
routed grenoble kinovis eth1 0 4 5 10
routed grenoble kinovis eth2 0 4 5 20
+ routed grenoble chartreuse2 eth0 0 4 6 0
+ routed grenoble chartreuse2 eth1 0 4 6 10
routed lille chifflot eth0 0 8 4 0
routed lille chifflot eth1 0 8 5 0
routed lille chiclet eth0 0 8 6 0
--
GitLab
From f4572f3c03ce806d52e327d6de4111d1a238a644 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Wed, 5 Mar 2025 14:44:01 +0100
Subject: [PATCH 2/2] [Grenoble][Chartreuse] Remove eth1 for chartreuse2
---
input/grid5000/vlans.yaml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 95ae0f73cdd..3b79a488c71 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -75,7 +75,6 @@ vlans:
local grenoble kinovis eth1 0 0 5 10
local grenoble kinovis eth2 0 0 5 20
local grenoble chartreuse2 eth0 0 0 6 0
- local grenoble chartreuse2 eth1 0 0 6 10
local lille chifflot eth0 0 0 4 0
local lille chifflot eth1 0 0 5 0
local lille chiclet eth0 0 0 6 0
@@ -293,7 +292,6 @@ vlans:
global grenoble kinovis eth1 0 0 54 10
global grenoble kinovis eth2 0 0 54 20
global grenoble chartreuse2 eth0 0 0 55 0
- global grenoble chartreuse2 eth1 0 0 55 10
routed grenoble yeti eth0 0 4 0 0
routed grenoble dahu eth0 0 4 1 0
routed grenoble troll eth0 0 4 2 0
@@ -305,7 +303,6 @@ vlans:
routed grenoble kinovis eth1 0 4 5 10
routed grenoble kinovis eth2 0 4 5 20
routed grenoble chartreuse2 eth0 0 4 6 0
- routed grenoble chartreuse2 eth1 0 4 6 10
routed lille chifflot eth0 0 8 4 0
routed lille chifflot eth1 0 8 5 0
routed lille chiclet eth0 0 8 6 0
--
GitLab