Merge branch 'gruss' into 'master'

[nancy/gruss] Add kavlan support on gruss cluster

See merge request !301

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

 {
   "created_at": "Thu, 26 Aug 2021 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "metrics": [
 
   ],

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

@@ -38,6 +38,48 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth2": {
+      "kavlan-1": "192.168.207.11",
+      "kavlan-11": "10.7.233.1",
+      "kavlan-12": "10.11.233.1",
+      "kavlan-13": "10.15.233.1",
+      "kavlan-14": "10.19.233.1",
+      "kavlan-16": "10.27.233.1",
+      "kavlan-18": "10.35.233.1",
+      "kavlan-2": "192.168.223.11",
+      "kavlan-20": "10.43.233.1",
+      "kavlan-21": "10.47.233.1",
+      "kavlan-3": "192.168.239.11",
+      "kavlan-4": "10.16.16.1",
+      "kavlan-5": "10.16.80.1",
+      "kavlan-6": "10.16.144.1",
+      "kavlan-7": "10.16.208.1",
+      "kavlan-8": "10.17.16.1",
+      "kavlan-9": "10.17.80.1"
+    }
+  },
+  "kavlan6": {
+    "eth2": {
+      "kavlan-1": "2001:660:4406:580:6::1",
+      "kavlan-11": "2001:660:4406:1a0:506::1",
+      "kavlan-12": "2001:660:4406:2a0:506::1",
+      "kavlan-13": "2001:660:4406:4a0:506::1",
+      "kavlan-14": "2001:660:4406:5a0:506::1",
+      "kavlan-16": "2001:660:4406:7a0:506::1",
+      "kavlan-18": "2001:660:4406:8a0:506::1",
+      "kavlan-2": "2001:660:4406:581:6::1",
+      "kavlan-20": "2001:660:4406:3a0:506::1",
+      "kavlan-21": "2001:660:4406:6a0:506::1",
+      "kavlan-3": "2001:660:4406:582:6::1",
+      "kavlan-4": "2001:660:4406:590:6::1",
+      "kavlan-5": "2001:660:4406:591:6::1",
+      "kavlan-6": "2001:660:4406:592:6::1",
+      "kavlan-7": "2001:660:4406:593:6::1",
+      "kavlan-8": "2001:660:4406:594:6::1",
+      "kavlan-9": "2001:660:4406:595:6::1"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -84,7 +126,7 @@
       "interface": "Ethernet",
       "ip": "172.16.69.1",
       "ip6": "2001:660:4406:500:6::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "b8:ce:f6:2b:30:5c",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json

@@ -38,6 +38,48 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth2": {
+      "kavlan-1": "192.168.207.12",
+      "kavlan-11": "10.7.233.2",
+      "kavlan-12": "10.11.233.2",
+      "kavlan-13": "10.15.233.2",
+      "kavlan-14": "10.19.233.2",
+      "kavlan-16": "10.27.233.2",
+      "kavlan-18": "10.35.233.2",
+      "kavlan-2": "192.168.223.12",
+      "kavlan-20": "10.43.233.2",
+      "kavlan-21": "10.47.233.2",
+      "kavlan-3": "192.168.239.12",
+      "kavlan-4": "10.16.16.2",
+      "kavlan-5": "10.16.80.2",
+      "kavlan-6": "10.16.144.2",
+      "kavlan-7": "10.16.208.2",
+      "kavlan-8": "10.17.16.2",
+      "kavlan-9": "10.17.80.2"
+    }
+  },
+  "kavlan6": {
+    "eth2": {
+      "kavlan-1": "2001:660:4406:580:6::2",
+      "kavlan-11": "2001:660:4406:1a0:506::2",
+      "kavlan-12": "2001:660:4406:2a0:506::2",
+      "kavlan-13": "2001:660:4406:4a0:506::2",
+      "kavlan-14": "2001:660:4406:5a0:506::2",
+      "kavlan-16": "2001:660:4406:7a0:506::2",
+      "kavlan-18": "2001:660:4406:8a0:506::2",
+      "kavlan-2": "2001:660:4406:581:6::2",
+      "kavlan-20": "2001:660:4406:3a0:506::2",
+      "kavlan-21": "2001:660:4406:6a0:506::2",
+      "kavlan-3": "2001:660:4406:582:6::2",
+      "kavlan-4": "2001:660:4406:590:6::2",
+      "kavlan-5": "2001:660:4406:591:6::2",
+      "kavlan-6": "2001:660:4406:592:6::2",
+      "kavlan-7": "2001:660:4406:593:6::2",
+      "kavlan-8": "2001:660:4406:594:6::2",
+      "kavlan-9": "2001:660:4406:595:6::2"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -84,7 +126,7 @@
       "interface": "Ethernet",
       "ip": "172.16.69.2",
       "ip6": "2001:660:4406:500:6::2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "b8:ce:f6:33:52:86",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json

@@ -38,6 +38,48 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth2": {
+      "kavlan-1": "192.168.207.13",
+      "kavlan-11": "10.7.233.3",
+      "kavlan-12": "10.11.233.3",
+      "kavlan-13": "10.15.233.3",
+      "kavlan-14": "10.19.233.3",
+      "kavlan-16": "10.27.233.3",
+      "kavlan-18": "10.35.233.3",
+      "kavlan-2": "192.168.223.13",
+      "kavlan-20": "10.43.233.3",
+      "kavlan-21": "10.47.233.3",
+      "kavlan-3": "192.168.239.13",
+      "kavlan-4": "10.16.16.3",
+      "kavlan-5": "10.16.80.3",
+      "kavlan-6": "10.16.144.3",
+      "kavlan-7": "10.16.208.3",
+      "kavlan-8": "10.17.16.3",
+      "kavlan-9": "10.17.80.3"
+    }
+  },
+  "kavlan6": {
+    "eth2": {
+      "kavlan-1": "2001:660:4406:580:6::3",
+      "kavlan-11": "2001:660:4406:1a0:506::3",
+      "kavlan-12": "2001:660:4406:2a0:506::3",
+      "kavlan-13": "2001:660:4406:4a0:506::3",
+      "kavlan-14": "2001:660:4406:5a0:506::3",
+      "kavlan-16": "2001:660:4406:7a0:506::3",
+      "kavlan-18": "2001:660:4406:8a0:506::3",
+      "kavlan-2": "2001:660:4406:581:6::3",
+      "kavlan-20": "2001:660:4406:3a0:506::3",
+      "kavlan-21": "2001:660:4406:6a0:506::3",
+      "kavlan-3": "2001:660:4406:582:6::3",
+      "kavlan-4": "2001:660:4406:590:6::3",
+      "kavlan-5": "2001:660:4406:591:6::3",
+      "kavlan-6": "2001:660:4406:592:6::3",
+      "kavlan-7": "2001:660:4406:593:6::3",
+      "kavlan-8": "2001:660:4406:594:6::3",
+      "kavlan-9": "2001:660:4406:595:6::3"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -84,7 +126,7 @@
       "interface": "Ethernet",
       "ip": "172.16.69.3",
       "ip6": "2001:660:4406:500:6::3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "b8:ce:f6:38:3b:e2",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json

@@ -38,6 +38,48 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth2": {
+      "kavlan-1": "192.168.207.14",
+      "kavlan-11": "10.7.233.4",
+      "kavlan-12": "10.11.233.4",
+      "kavlan-13": "10.15.233.4",
+      "kavlan-14": "10.19.233.4",
+      "kavlan-16": "10.27.233.4",
+      "kavlan-18": "10.35.233.4",
+      "kavlan-2": "192.168.223.14",
+      "kavlan-20": "10.43.233.4",
+      "kavlan-21": "10.47.233.4",
+      "kavlan-3": "192.168.239.14",
+      "kavlan-4": "10.16.16.4",
+      "kavlan-5": "10.16.80.4",
+      "kavlan-6": "10.16.144.4",
+      "kavlan-7": "10.16.208.4",
+      "kavlan-8": "10.17.16.4",
+      "kavlan-9": "10.17.80.4"
+    }
+  },
+  "kavlan6": {
+    "eth2": {
+      "kavlan-1": "2001:660:4406:580:6::4",
+      "kavlan-11": "2001:660:4406:1a0:506::4",
+      "kavlan-12": "2001:660:4406:2a0:506::4",
+      "kavlan-13": "2001:660:4406:4a0:506::4",
+      "kavlan-14": "2001:660:4406:5a0:506::4",
+      "kavlan-16": "2001:660:4406:7a0:506::4",
+      "kavlan-18": "2001:660:4406:8a0:506::4",
+      "kavlan-2": "2001:660:4406:581:6::4",
+      "kavlan-20": "2001:660:4406:3a0:506::4",
+      "kavlan-21": "2001:660:4406:6a0:506::4",
+      "kavlan-3": "2001:660:4406:582:6::4",
+      "kavlan-4": "2001:660:4406:590:6::4",
+      "kavlan-5": "2001:660:4406:591:6::4",
+      "kavlan-6": "2001:660:4406:592:6::4",
+      "kavlan-7": "2001:660:4406:593:6::4",
+      "kavlan-8": "2001:660:4406:594:6::4",
+      "kavlan-9": "2001:660:4406:595:6::4"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -84,7 +126,7 @@
       "interface": "Ethernet",
       "ip": "172.16.69.4",
       "ip6": "2001:660:4406:500:6::4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "b8:ce:f6:38:3e:9a",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",

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

 model: Dell PowerEdge R7525
 created_at: 2021-08-26
-kavlan: false
+kavlan: true
 exotic: false
 queues:
 - admin

input/grid5000/vlans.yaml

@@ -105,6 +105,7 @@ vlans:
       local nancy grue eth0 0 0 13 0
       local nancy grappe eth0 0 0 14 0
       local nancy grouille eth2 0 0 15 0
+      local nancy gruss eth2 0 0 15 10
       local nantes econome eth0 0 0 0 0
       local nantes ecotype eth0 0 0 1 0
       local nantes ecotype eth1 0 0 2 0
@@ -170,6 +171,7 @@ vlans:
       global rennes parapide eth0 0 0 35 0
       global rennes parapluie eth1 0 0 36 0
       global sophia uvb eth0 0 0 40 0
+      global nancy gruss eth2 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
       global nantes econome eth0 0 0 48 0
@@ -217,6 +219,7 @@ vlans:
       routed nancy grue eth0 0 16 13 0
       routed nancy grappe eth0 0 16 14 0
       routed nancy grouille eth2 0 16 15 0
+      routed nancy gruss eth2 0 16 16 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