From 8592bbc7843fe6956189eea51130bdc401ee1962 Mon Sep 17 00:00:00 2001 From: David Loup <david.loup@inria.fr> Date: Fri, 12 Jun 2020 18:01:01 +0200 Subject: [PATCH] [pyxis] Add complete Infiniband information (2/2, cf add new cluster) --- .../lyon/clusters/pyxis/nodes/pyxis-1.json | 9 +++++++- .../lyon/clusters/pyxis/nodes/pyxis-2.json | 9 +++++++- .../lyon/clusters/pyxis/nodes/pyxis-3.json | 9 +++++++- .../lyon/clusters/pyxis/nodes/pyxis-4.json | 9 +++++++- .../lyon/clusters/pyxis/nodes/pyxis-1.yaml | 12 ++++++++++ .../lyon/clusters/pyxis/nodes/pyxis-2.yaml | 12 ++++++++++ .../lyon/clusters/pyxis/nodes/pyxis-3.yaml | 12 ++++++++++ .../lyon/clusters/pyxis/nodes/pyxis-4.yaml | 12 ++++++++++ .../sites/lyon/clusters/pyxis/pyxis_ib.yaml | 22 ------------------- 9 files changed, 80 insertions(+), 26 deletions(-) diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json index 8d1bb62156c..2670e218069 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json @@ -104,16 +104,23 @@ }, { "device": "ib0", + "driver": "mlx5_core", "enabled": true, + "firmware_version": "20.25.2006", + "guid": "0xb8599f0300d1f706", "interface": "InfiniBand", "ip": "172.18.54.1", "kavlan": false, "mac": "00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:05", "management": false, + "model": "MT28908 Family [ConnectX-6]", "mountable": true, "mounted": true, + "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-1-ib0.lyon.grid5000.fr" + "network_address": "pyxis-1-ib0.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" }, { "device": "bmc", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json index 59c9b157281..e403452b36c 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json @@ -104,16 +104,23 @@ }, { "device": "ib0", + "driver": "mlx5_core", "enabled": true, + "firmware_version": "20.25.2006", + "guid": "0xb8599f0300d1f706", "interface": "InfiniBand", "ip": "172.18.54.2", "kavlan": false, "mac": "00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:06", "management": false, + "model": "MT28908 Family [ConnectX-6]", "mountable": true, "mounted": true, + "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-2-ib0.lyon.grid5000.fr" + "network_address": "pyxis-2-ib0.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" }, { "device": "bmc", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json index dbfa70a344f..59958a5939e 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json @@ -104,16 +104,23 @@ }, { "device": "ib0", + "driver": "mlx5_core", "enabled": true, + "firmware_version": "20.25.2006", + "guid": "0xb8599f0300d1f6f2", "interface": "InfiniBand", "ip": "172.18.54.3", "kavlan": false, "mac": "00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f6:f2", "management": false, + "model": "MT28908 Family [ConnectX-6]", "mountable": true, "mounted": true, + "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-3-ib0.lyon.grid5000.fr" + "network_address": "pyxis-3-ib0.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" }, { "device": "bmc", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json index 0f85c3e8f10..f5a4a15d831 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json @@ -104,16 +104,23 @@ }, { "device": "ib0", + "driver": "mlx5_core", "enabled": true, + "firmware_version": "20.25.2006", + "guid": "0xb8599f0300d1fa66", "interface": "InfiniBand", "ip": "172.18.54.4", "kavlan": false, "mac": "00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:fa:66", "management": false, + "model": "MT28908 Family [ConnectX-6]", "mountable": true, "mounted": true, + "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-4-ib0.lyon.grid5000.fr" + "network_address": "pyxis-4-ib0.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" }, { "device": "bmc", diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml index b2f8e44e4dd..28837451f11 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml @@ -43,6 +43,18 @@ pyxis-1: model: FastLinQ QL41000 Series 10/25/40/50GbE Controller name: eno2 vendor: QLogic Corp. + ib0: + driver: mlx5_core + firmware_version: 20.25.2006 + guid: '0xb8599f0300d1f706' + interface: InfiniBand + ip: 172.18.54.1 + mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:05 + management: false + model: MT28908 Family [ConnectX-6] + name: ib0 + rate: 10000000000 + vendor: Mellanox Technologies operating_system: cstate_driver: none cstate_governor: menu diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml index 580a8b00051..22bb5756ec7 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml @@ -43,6 +43,18 @@ pyxis-2: model: FastLinQ QL41000 Series 10/25/40/50GbE Controller name: eno2 vendor: QLogic Corp. + ib0: + driver: mlx5_core + firmware_version: 20.25.2006 + guid: '0xb8599f0300d1f706' + interface: InfiniBand + ip: 172.18.54.2 + mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:06 + management: false + model: MT28908 Family [ConnectX-6] + name: ib0 + rate: 10000000000 + vendor: Mellanox Technologies operating_system: cstate_driver: none cstate_governor: menu diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml index 91b20b60618..01778d24374 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml @@ -43,6 +43,18 @@ pyxis-3: model: FastLinQ QL41000 Series 10/25/40/50GbE Controller name: eno2 vendor: QLogic Corp. + ib0: + driver: mlx5_core + firmware_version: 20.25.2006 + guid: '0xb8599f0300d1f6f2' + interface: InfiniBand + ip: 172.18.54.3 + mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f6:f2 + management: false + model: MT28908 Family [ConnectX-6] + name: ib0 + rate: 10000000000 + vendor: Mellanox Technologies operating_system: cstate_driver: none cstate_governor: menu diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml index 3c58d840d16..8331c75434a 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml @@ -43,6 +43,18 @@ pyxis-4: model: FastLinQ QL41000 Series 10/25/40/50GbE Controller name: eno2 vendor: QLogic Corp. + ib0: + driver: mlx5_core + firmware_version: 20.25.2006 + guid: '0xb8599f0300d1fa66' + interface: InfiniBand + ip: 172.18.54.4 + mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:fa:66 + management: false + model: MT28908 Family [ConnectX-6] + name: ib0 + rate: 10000000000 + vendor: Mellanox Technologies operating_system: cstate_driver: none cstate_governor: menu diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml index e34d27cc980..cfe6a1af79d 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml @@ -5,26 +5,4 @@ nodes: enabled: true mountable: true mounted: true - management: false - interface: InfiniBand netmask: 255.255.240.0 - pyxis-1: - network_adapters: - ib0: - ip: 172.18.54.1 - mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:05 - pyxis-2: - network_adapters: - ib0: - ip: 172.18.54.2 - mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f7:06 - pyxis-3: - network_adapters: - ib0: - ip: 172.18.54.3 - mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:f6:f2 - pyxis-4: - network_adapters: - ib0: - ip: 172.18.54.4 - mac: 00:00:10:86:fe:80:00:00:00:00:00:00:b8:59:9f:03:00:d1:fa:66 -- GitLab