Merge branch 'gratouille-prod' into 'master'

[nancy][gratouille] configure kavlan

See merge request !962

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

@@ -2,7 +2,7 @@
   "boot_type": "bios",
   "created_at": "Mon, 26 Jun 2017 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2017-06-07",
   "metrics": [
     {

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

@@ -39,6 +39,50 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.203.15",
+      "kavlan-11": "10.7.211.15",
+      "kavlan-12": "10.11.211.15",
+      "kavlan-13": "10.15.211.15",
+      "kavlan-14": "10.19.211.15",
+      "kavlan-16": "10.27.211.15",
+      "kavlan-17": "10.31.211.15",
+      "kavlan-18": "10.35.211.15",
+      "kavlan-2": "192.168.219.15",
+      "kavlan-20": "10.43.211.15",
+      "kavlan-21": "10.47.211.15",
+      "kavlan-3": "192.168.235.15",
+      "kavlan-4": "10.16.11.15",
+      "kavlan-5": "10.16.75.15",
+      "kavlan-6": "10.16.139.15",
+      "kavlan-7": "10.16.203.15",
+      "kavlan-8": "10.17.11.15",
+      "kavlan-9": "10.17.75.15"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:580:b::f",
+      "kavlan-11": "2001:660:4406:1a0:50b::f",
+      "kavlan-12": "2001:660:4406:2a0:50b::f",
+      "kavlan-13": "2001:660:4406:4a0:50b::f",
+      "kavlan-14": "2001:660:4406:5a0:50b::f",
+      "kavlan-16": "2001:660:4406:7a0:50b::f",
+      "kavlan-17": "2001:660:4406:9a0:50b::f",
+      "kavlan-18": "2001:660:4406:8a0:50b::f",
+      "kavlan-2": "2001:660:4406:581:b::f",
+      "kavlan-20": "2001:660:4406:3a0:50b::f",
+      "kavlan-21": "2001:660:4406:6a0:50b::f",
+      "kavlan-3": "2001:660:4406:582:b::f",
+      "kavlan-4": "2001:660:4406:590:b::f",
+      "kavlan-5": "2001:660:4406:591:b::f",
+      "kavlan-6": "2001:660:4406:592:b::f",
+      "kavlan-7": "2001:660:4406:593:b::f",
+      "kavlan-8": "2001:660:4406:594:b::f",
+      "kavlan-9": "2001:660:4406:595:b::f"
+    }
+  },
   "main_memory": {
     "ram_size": 137438953472
   },
@@ -99,7 +143,7 @@
       "interface": "Ethernet",
       "ip": "172.16.74.15",
       "ip6": "2001:660:4406:500:b::f",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "24:6e:96:63:dd:f0",
       "management": false,
       "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",

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

@@ -2,7 +2,7 @@
 # Cluster description
 model: Dell PowerEdge R730
 created_at: 2017-06-26
-kavlan: false
+kavlan: true
 boot_type: bios
 queues:
   - admin

input/grid5000/vlans.yaml

@@ -96,6 +96,7 @@ vlans:
       local nancy grdix eth0 0 0 2 10
       local nancy grvingt eth0 0 0 3 0
       local nancy grele eth0 0 0 11 0
+      local nancy gratouille eth0 0 0 11 14
       local nancy graffiti eth2 0 0 12 0
       local nancy grue eth0 0 0 13 0
       local nancy grat eth0 0 0 13 10
@@ -145,6 +146,7 @@ vlans:
       global nancy gros eth0 0 0 15 0
       global nancy gros eth1 0 0 15 130
       global nancy grele eth0 0 0 19 0
+      global nancy gratouille eth0 0 0 19 14
       global lyon neowise eth0 0 0 20 0
       global lyon sirius eth0 0 0 21 0
       global nancy grvingt eth0 0 0 24 0
@@ -212,6 +214,7 @@ vlans:
       routed nancy gres eth0 0 16 10 0
       routed nancy grdix eth0 0 16 10 10
       routed nancy grele eth0 0 16 11 0
+      routed nancy gratouille eth0 0 16 11 14
       routed nancy graffiti eth2 0 16 12 0
       routed nancy grue eth0 0 16 13 0
       routed nancy grat eth0 0 16 13 10