Merge branch 'production-esterel40' into 'master'

Revert "[sophia][esterel40] add kavlan support"

See merge request !1416

data/grid5000/sites/sophia/clusters/esterel40/esterel40.json

@@ -2,7 +2,7 @@
   "boot_type": "uefi",
   "created_at": "Mon, 07 Jul 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": true,
+  "kavlan": false,
   "manufactured_at": "2023-10-24",
   "metrics": [
     {

data/grid5000/sites/sophia/clusters/esterel40/nodes/esterel40-1.json

@@ -57,52 +57,6 @@
       "vendor": "Nvidia"
     }
   },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.195.54",
-      "kavlan-11": "10.7.230.54",
-      "kavlan-12": "10.11.230.54",
-      "kavlan-13": "10.15.230.54",
-      "kavlan-14": "10.19.230.54",
-      "kavlan-16": "10.27.230.54",
-      "kavlan-17": "10.31.230.54",
-      "kavlan-18": "10.35.230.54",
-      "kavlan-2": "192.168.211.54",
-      "kavlan-20": "10.43.230.54",
-      "kavlan-21": "10.47.230.54",
-      "kavlan-22": "10.51.230.54",
-      "kavlan-3": "192.168.227.54",
-      "kavlan-4": "10.32.3.54",
-      "kavlan-5": "10.32.67.54",
-      "kavlan-6": "10.32.131.54",
-      "kavlan-7": "10.32.195.54",
-      "kavlan-8": "10.33.3.54",
-      "kavlan-9": "10.33.67.54"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:880:4::36",
-      "kavlan-11": "2001:660:4406:1a0:804::36",
-      "kavlan-12": "2001:660:4406:2a0:804::36",
-      "kavlan-13": "2001:660:4406:4a0:804::36",
-      "kavlan-14": "2001:660:4406:5a0:804::36",
-      "kavlan-16": "2001:660:4406:7a0:804::36",
-      "kavlan-17": "2001:660:4406:9a0:804::36",
-      "kavlan-18": "2001:660:4406:8a0:804::36",
-      "kavlan-2": "2001:660:4406:881:4::36",
-      "kavlan-20": "2001:660:4406:3a0:804::36",
-      "kavlan-21": "2001:660:4406:6a0:804::36",
-      "kavlan-22": "2001:660:4406:ba0:804::36",
-      "kavlan-3": "2001:660:4406:882:4::36",
-      "kavlan-4": "2001:660:4406:890:4::36",
-      "kavlan-5": "2001:660:4406:891:4::36",
-      "kavlan-6": "2001:660:4406:892:4::36",
-      "kavlan-7": "2001:660:4406:893:4::36",
-      "kavlan-8": "2001:660:4406:894:4::36",
-      "kavlan-9": "2001:660:4406:895:4::36"
-    }
-  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -163,7 +117,7 @@
       "interface": "Ethernet",
       "ip": "172.16.131.54",
       "ip6": "2001:660:4406:800:4::36",
-      "kavlan": true,
+      "kavlan": false,
       "mac": "50:7c:6f:4f:43:06",
       "management": false,
       "model": "I350 Gigabit Network Connection",

data/grid5000/sites/sophia/clusters/esterel40/nodes/esterel40-2.json

@@ -57,52 +57,6 @@
       "vendor": "Nvidia"
     }
   },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.195.55",
-      "kavlan-11": "10.7.230.55",
-      "kavlan-12": "10.11.230.55",
-      "kavlan-13": "10.15.230.55",
-      "kavlan-14": "10.19.230.55",
-      "kavlan-16": "10.27.230.55",
-      "kavlan-17": "10.31.230.55",
-      "kavlan-18": "10.35.230.55",
-      "kavlan-2": "192.168.211.55",
-      "kavlan-20": "10.43.230.55",
-      "kavlan-21": "10.47.230.55",
-      "kavlan-22": "10.51.230.55",
-      "kavlan-3": "192.168.227.55",
-      "kavlan-4": "10.32.3.55",
-      "kavlan-5": "10.32.67.55",
-      "kavlan-6": "10.32.131.55",
-      "kavlan-7": "10.32.195.55",
-      "kavlan-8": "10.33.3.55",
-      "kavlan-9": "10.33.67.55"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:880:4::37",
-      "kavlan-11": "2001:660:4406:1a0:804::37",
-      "kavlan-12": "2001:660:4406:2a0:804::37",
-      "kavlan-13": "2001:660:4406:4a0:804::37",
-      "kavlan-14": "2001:660:4406:5a0:804::37",
-      "kavlan-16": "2001:660:4406:7a0:804::37",
-      "kavlan-17": "2001:660:4406:9a0:804::37",
-      "kavlan-18": "2001:660:4406:8a0:804::37",
-      "kavlan-2": "2001:660:4406:881:4::37",
-      "kavlan-20": "2001:660:4406:3a0:804::37",
-      "kavlan-21": "2001:660:4406:6a0:804::37",
-      "kavlan-22": "2001:660:4406:ba0:804::37",
-      "kavlan-3": "2001:660:4406:882:4::37",
-      "kavlan-4": "2001:660:4406:890:4::37",
-      "kavlan-5": "2001:660:4406:891:4::37",
-      "kavlan-6": "2001:660:4406:892:4::37",
-      "kavlan-7": "2001:660:4406:893:4::37",
-      "kavlan-8": "2001:660:4406:894:4::37",
-      "kavlan-9": "2001:660:4406:895:4::37"
-    }
-  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -163,7 +117,7 @@
       "interface": "Ethernet",
       "ip": "172.16.131.55",
       "ip6": "2001:660:4406:800:4::37",
-      "kavlan": true,
+      "kavlan": false,
       "mac": "50:7c:6f:64:6e:6a",
       "management": false,
       "model": "I350 Gigabit Network Connection",

input/grid5000/sites/sophia/clusters/esterel40/esterel40.yaml

 ---
 model: ProLiant DL385 Gen10 Plus v2
 created_at: 2025-07-07
-kavlan: true
+kavlan: false
 boot_type: uefi
 exotic: false
 queues: