Merge branch 'grat' into 'master'

[kavlan/grat] Add kavlan configuration for grat

See merge request !440

data/grid5000/sites/nancy/clusters/grat/grat.json

@@ -2,7 +2,7 @@
   "boot_type": "uefi",
   "created_at": "Wed, 07 Sep 2022 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "metrics": [
     {
       "description": "Input byte counter for the network device port",

data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json

@@ -100,6 +100,48 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.205.11",
+      "kavlan-11": "10.7.221.11",
+      "kavlan-12": "10.11.221.11",
+      "kavlan-13": "10.15.221.11",
+      "kavlan-14": "10.19.221.11",
+      "kavlan-16": "10.27.221.11",
+      "kavlan-18": "10.35.221.11",
+      "kavlan-2": "192.168.221.11",
+      "kavlan-20": "10.43.221.11",
+      "kavlan-21": "10.47.221.11",
+      "kavlan-3": "192.168.237.11",
+      "kavlan-4": "10.16.13.11",
+      "kavlan-5": "10.16.77.11",
+      "kavlan-6": "10.16.141.11",
+      "kavlan-7": "10.16.205.11",
+      "kavlan-8": "10.17.13.11",
+      "kavlan-9": "10.17.77.11"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:580:6::b",
+      "kavlan-11": "2001:660:4406:1a0:506::b",
+      "kavlan-12": "2001:660:4406:2a0:506::b",
+      "kavlan-13": "2001:660:4406:4a0:506::b",
+      "kavlan-14": "2001:660:4406:5a0:506::b",
+      "kavlan-16": "2001:660:4406:7a0:506::b",
+      "kavlan-18": "2001:660:4406:8a0:506::b",
+      "kavlan-2": "2001:660:4406:581:6::b",
+      "kavlan-20": "2001:660:4406:3a0:506::b",
+      "kavlan-21": "2001:660:4406:6a0:506::b",
+      "kavlan-3": "2001:660:4406:582:6::b",
+      "kavlan-4": "2001:660:4406:590:6::b",
+      "kavlan-5": "2001:660:4406:591:6::b",
+      "kavlan-6": "2001:660:4406:592:6::b",
+      "kavlan-7": "2001:660:4406:593:6::b",
+      "kavlan-8": "2001:660:4406:594:6::b",
+      "kavlan-9": "2001:660:4406:595:6::b"
+    }
+  },
   "main_memory": {
     "ram_size": 549755813888
   },
@@ -200,7 +242,7 @@
       "interface": "Ethernet",
       "ip": "172.16.69.11",
       "ip6": "2001:660:4406:500:6::b",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:91:0d:42",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",

input/grid5000/sites/nancy/clusters/grat/grat.yaml

 model: HPe Apollo 6500
 created_at: 2022-09-07
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false
 queues:

input/grid5000/vlans.yaml

@@ -107,6 +107,7 @@ vlans:
       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 nancy grat eth0 0 0 13 10
       local nancy grappe eth0 0 0 14 0
       local nancy grouille eth2 0 0 15 0
       local nancy gruss eth2 0 0 15 10
@@ -162,6 +163,7 @@ vlans:
       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 nancy grat eth0 0 0 29 10
       global nancy grappe eth0 0 0 30 0
       global nancy grouille eth2 0 0 31 0
       global rennes paravance eth0 0 0 32 0
@@ -225,6 +227,7 @@ vlans:
       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 nancy grat eth0 0 16 13 10
       routed nancy grappe eth0 0 16 14 0
       routed nancy grouille eth2 0 16 15 0
       routed nancy gruss eth2 0 16 16 0