From 3a37afb96ef25b47ef95b55f8e33e3072fe3920a Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Mon, 7 Jun 2021 15:47:47 +0200
Subject: [PATCH] [lyon/neowise] Fix status of network for neowise
---
.../lyon/clusters/neowise/nodes/neowise-1.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-10.json | 12 ++----------
.../lyon/clusters/neowise/nodes/neowise-2.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-3.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-4.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-5.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-6.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-7.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-8.json | 10 +++++-----
.../lyon/clusters/neowise/nodes/neowise-9.json | 12 ++----------
.../sites/lyon/clusters/neowise/neowise.yaml | 10 +---------
.../sites/lyon/clusters/neowise/neowise_ib.yaml | 13 +++++++++++++
12 files changed, 58 insertions(+), 69 deletions(-)
create mode 100644 input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index 3e591d6d2e6..943d7f92d9a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-1.lyon.grid5000.fr",
+ "network_address": "neowise-1-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/1",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-1-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:f1:e8",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-1-ib1.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index be80c4d37fb..94530f19e40 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-10.lyon.grid5000.fr",
+ "network_address": "neowise-10-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/10",
@@ -141,7 +141,6 @@
{
"device": "ib0",
"driver": "mlx5_core",
- "enabled": true,
"firmware_version": "20.29.2002",
"guid": "0x0c42a103009106a2",
"interface": "InfiniBand",
@@ -149,17 +148,13 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:91:06:a2",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
"name": "ib0",
- "network_address": "neowise-10-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
{
"device": "ib1",
"driver": "mlx5_core",
- "enabled": true,
"firmware_version": "20.29.2002",
"guid": "0x0c42a103008d2118",
"interface": "InfiniBand",
@@ -167,10 +162,7 @@
"mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:8d:21:18",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
"name": "ib1",
- "network_address": "neowise-10-ib1.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index cc2032eda9f..248b2b17d1e 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-2.lyon.grid5000.fr",
+ "network_address": "neowise-2-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/2",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-2-ib0.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:d2:13:2a",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-2-ib1.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index d718304e755..4dd1e522442 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-3.lyon.grid5000.fr",
+ "network_address": "neowise-3-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/3",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-3-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:f9:0c",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-3-ib1.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index 6cdddc47175..51a18c8b3ff 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-4.lyon.grid5000.fr",
+ "network_address": "neowise-4-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/4",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-4-ib0.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fb:60",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-4-ib1.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index f633fbaf0fb..8d9509f7e7e 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-5.lyon.grid5000.fr",
+ "network_address": "neowise-5-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/5",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-5-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:d2:0b:6a",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-5-ib1.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index 18a33ec415a..b398e0d9e54 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-6.lyon.grid5000.fr",
+ "network_address": "neowise-6-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/6",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-6-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fa:f4",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-6-ib1.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index 67724823de1..6a56310d64a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-7.lyon.grid5000.fr",
+ "network_address": "neowise-7-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/7",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-7-ib0.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:54",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-7-ib1.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
index 312f1408055..916b9d1cfc1 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-8.lyon.grid5000.fr",
+ "network_address": "neowise-8-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/8",
@@ -152,6 +152,7 @@
"mountable": true,
"mounted": true,
"name": "ib0",
+ "netmask": "255.255.240.0",
"network_address": "neowise-8-ib0.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
"mac": "00:00:04:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:20",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
+ "mountable": false,
+ "mounted": false,
"name": "ib1",
- "network_address": "neowise-8-ib1.lyon.grid5000.fr",
"rate": 200000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index a5bc6deb67d..54f4c7bea58 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -130,9 +130,9 @@
"management": false,
"model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
- "mounted": true,
+ "mounted": false,
"name": "eno2",
- "network_address": "neowise-9.lyon.grid5000.fr",
+ "network_address": "neowise-9-eth1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "sneowise",
"switch_port": "1/9",
@@ -141,7 +141,6 @@
{
"device": "ib0",
"driver": "mlx5_core",
- "enabled": true,
"firmware_version": "20.29.2002",
"guid": "0x0c42a10300a0fc48",
"interface": "InfiniBand",
@@ -149,17 +148,13 @@
"mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:48",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
"name": "ib0",
- "network_address": "neowise-9-ib0.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
{
"device": "ib1",
"driver": "mlx5_core",
- "enabled": true,
"firmware_version": "20.29.2002",
"guid": "0x0c42a10300a0fc20",
"interface": "InfiniBand",
@@ -167,10 +162,7 @@
"mac": "00:00:04:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:20",
"management": false,
"model": "MT28908 Family [ConnectX-6]",
- "mountable": true,
- "mounted": true,
"name": "ib1",
- "network_address": "neowise-9-ib1.lyon.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox Technologies"
},
diff --git a/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml b/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
index 3e3bbcf9337..24ca2c87fa8 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
@@ -29,15 +29,7 @@ nodes:
eth1:
enabled: true
mountable: true
- mounted: true
- ib0:
- enabled: true
- mountable: true
- mounted: true
- ib1:
- enabled: true
- mountable: true
- mounted: true
+ mounted: false
storage_devices:
nvme0n1:
interface: NVME
diff --git a/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml b/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml
new file mode 100644
index 00000000000..b9f669daf9b
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml
@@ -0,0 +1,13 @@
+---
+nodes:
+ neowise-[1-8]:
+ network_adapters:
+ ib0:
+ enabled: true
+ mountable: true
+ mounted: true
+ netmask: 255.255.240.0
+ ib1:
+ enabled: true
+ mountable: false
+ mounted: false
--
GitLab