From 91dfbed16ac97c12319da30c93eb7f124b046c07 Mon Sep 17 00:00:00 2001 From: BERARD Benjamin <benjamin.berard@inria.fr> Date: Thu, 5 Dec 2019 18:13:25 +0100 Subject: [PATCH] [nancy][grue] Add vlan definition and kavlan configuration --- .../sites/nancy/clusters/grue/grue.json | 2 +- .../nancy/clusters/grue/nodes/grue-1.json | 23 ++++++++++++++++++- .../nancy/clusters/grue/nodes/grue-2.json | 23 ++++++++++++++++++- .../nancy/clusters/grue/nodes/grue-3.json | 23 ++++++++++++++++++- .../nancy/clusters/grue/nodes/grue-4.json | 23 ++++++++++++++++++- .../nancy/clusters/grue/nodes/grue-5.json | 23 ++++++++++++++++++- .../sites/nancy/clusters/grue/grue.yaml | 2 +- input/grid5000/vlans.yaml | 3 +++ 8 files changed, 115 insertions(+), 7 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json index 93f4b0fded6..8fc4731de66 100644 --- a/data/grid5000/sites/nancy/clusters/grue/grue.json +++ b/data/grid5000/sites/nancy/clusters/grue/grue.json @@ -1,6 +1,6 @@ { "created_at": "Mon, 25 Nov 2019 00:00:00 GMT", - "kavlan": false, + "kavlan": true, "model": "R7425", "queues": [ "admin", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json index bc3044647de..c20506239db 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json @@ -55,6 +55,27 @@ "vendor": "Nvidia" } }, + "kavlan": { + "eth0": { + "kavlan-1": "192.168.205.1", + "kavlan-11": "10.7.221.1", + "kavlan-12": "10.11.221.1", + "kavlan-13": "10.15.221.1", + "kavlan-14": "10.19.221.1", + "kavlan-16": "10.27.221.1", + "kavlan-18": "10.35.221.1", + "kavlan-2": "192.168.221.1", + "kavlan-20": "10.43.221.1", + "kavlan-21": "10.47.221.1", + "kavlan-3": "192.168.237.1", + "kavlan-4": "10.16.13.1", + "kavlan-5": "10.16.77.1", + "kavlan-6": "10.16.141.1", + "kavlan-7": "10.16.205.1", + "kavlan-8": "10.17.13.1", + "kavlan-9": "10.17.77.1" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -69,7 +90,7 @@ "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "ip": "172.16.77.1", - "kavlan": false, + "kavlan": true, "mac": "e4:43:4b:a5:71:dc", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json index 582359e22ec..4d0239c5fb7 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json @@ -55,6 +55,27 @@ "vendor": "Nvidia" } }, + "kavlan": { + "eth0": { + "kavlan-1": "192.168.205.2", + "kavlan-11": "10.7.221.2", + "kavlan-12": "10.11.221.2", + "kavlan-13": "10.15.221.2", + "kavlan-14": "10.19.221.2", + "kavlan-16": "10.27.221.2", + "kavlan-18": "10.35.221.2", + "kavlan-2": "192.168.221.2", + "kavlan-20": "10.43.221.2", + "kavlan-21": "10.47.221.2", + "kavlan-3": "192.168.237.2", + "kavlan-4": "10.16.13.2", + "kavlan-5": "10.16.77.2", + "kavlan-6": "10.16.141.2", + "kavlan-7": "10.16.205.2", + "kavlan-8": "10.17.13.2", + "kavlan-9": "10.17.77.2" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -69,7 +90,7 @@ "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "ip": "172.16.77.2", - "kavlan": false, + "kavlan": true, "mac": "e4:43:4b:a5:b1:10", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json index d700c0fbf10..bb3db7e6de5 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json @@ -55,6 +55,27 @@ "vendor": "Nvidia" } }, + "kavlan": { + "eth0": { + "kavlan-1": "192.168.205.3", + "kavlan-11": "10.7.221.3", + "kavlan-12": "10.11.221.3", + "kavlan-13": "10.15.221.3", + "kavlan-14": "10.19.221.3", + "kavlan-16": "10.27.221.3", + "kavlan-18": "10.35.221.3", + "kavlan-2": "192.168.221.3", + "kavlan-20": "10.43.221.3", + "kavlan-21": "10.47.221.3", + "kavlan-3": "192.168.237.3", + "kavlan-4": "10.16.13.3", + "kavlan-5": "10.16.77.3", + "kavlan-6": "10.16.141.3", + "kavlan-7": "10.16.205.3", + "kavlan-8": "10.17.13.3", + "kavlan-9": "10.17.77.3" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -69,7 +90,7 @@ "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "ip": "172.16.77.3", - "kavlan": false, + "kavlan": true, "mac": "e4:43:4b:a4:49:fa", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json index 59db94a6fcb..32934c9fb39 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json @@ -55,6 +55,27 @@ "vendor": "Nvidia" } }, + "kavlan": { + "eth0": { + "kavlan-1": "192.168.205.4", + "kavlan-11": "10.7.221.4", + "kavlan-12": "10.11.221.4", + "kavlan-13": "10.15.221.4", + "kavlan-14": "10.19.221.4", + "kavlan-16": "10.27.221.4", + "kavlan-18": "10.35.221.4", + "kavlan-2": "192.168.221.4", + "kavlan-20": "10.43.221.4", + "kavlan-21": "10.47.221.4", + "kavlan-3": "192.168.237.4", + "kavlan-4": "10.16.13.4", + "kavlan-5": "10.16.77.4", + "kavlan-6": "10.16.141.4", + "kavlan-7": "10.16.205.4", + "kavlan-8": "10.17.13.4", + "kavlan-9": "10.17.77.4" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -69,7 +90,7 @@ "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "ip": "172.16.77.4", - "kavlan": false, + "kavlan": true, "mac": "e4:43:4b:a5:4f:b8", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json index 39386e8175c..e325ca6d63f 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json @@ -55,6 +55,27 @@ "vendor": "Nvidia" } }, + "kavlan": { + "eth0": { + "kavlan-1": "192.168.205.5", + "kavlan-11": "10.7.221.5", + "kavlan-12": "10.11.221.5", + "kavlan-13": "10.15.221.5", + "kavlan-14": "10.19.221.5", + "kavlan-16": "10.27.221.5", + "kavlan-18": "10.35.221.5", + "kavlan-2": "192.168.221.5", + "kavlan-20": "10.43.221.5", + "kavlan-21": "10.47.221.5", + "kavlan-3": "192.168.237.5", + "kavlan-4": "10.16.13.5", + "kavlan-5": "10.16.77.5", + "kavlan-6": "10.16.141.5", + "kavlan-7": "10.16.205.5", + "kavlan-8": "10.17.13.5", + "kavlan-9": "10.17.77.5" + } + }, "main_memory": { "ram_size": 137438953472 }, @@ -69,7 +90,7 @@ "firmware_version": "7.10 0x8000519f 19.0.12", "interface": "Ethernet", "ip": "172.16.77.5", - "kavlan": false, + "kavlan": true, "mac": "e4:43:4b:a4:02:ec", "management": false, "model": "Ethernet Controller X710 for 10GbE SFP+", diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml index 9953271880a..ecba9581bcc 100644 --- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml +++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml @@ -1,6 +1,6 @@ model: R7425 created_at: 2019-11-25 - kavlan: false + kavlan: true queues: - admin - testing diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml index 2f9d5698ae6..b8781982602 100644 --- a/input/grid5000/vlans.yaml +++ b/input/grid5000/vlans.yaml @@ -99,6 +99,7 @@ vlans: local nancy grimani eth0 0 0 10 0 local nancy grele eth0 0 0 11 0 local nancy graffiti eth2 0 0 12 0 + local nancy grue eth0 0 0 13 0 local nantes econome eth0 0 0 0 0 local nantes ecotype eth0 0 0 1 0 local nantes ecotype eth1 0 0 2 0 @@ -148,6 +149,7 @@ vlans: global nancy graoully eth0 0 0 26 0 global nancy grimani eth0 0 0 27 0 global nancy graffiti eth2 0 0 28 0 + global nancy grue eth0 0 0 29 0 global rennes paravance eth0 0 0 32 0 global rennes paravance eth1 0 0 32 100 global rennes parasilo eth0 0 0 33 0 @@ -201,6 +203,7 @@ vlans: routed nancy grimani eth0 0 16 10 0 routed nancy grele eth0 0 16 11 0 routed nancy graffiti eth2 0 16 12 0 + routed nancy grue eth0 0 16 13 0 routed rennes parapide eth0 0 24 0 0 routed rennes parapluie eth1 0 24 1 0 routed rennes paranoia eth0 0 24 2 0 -- GitLab