From af74a506ee32d0fdf8d8c8892eb1902a2afa11ab Mon Sep 17 00:00:00 2001 From: Nicolas Michon <nicolas.michon@inria.fr> Date: Thu, 21 Sep 2017 14:13:55 +0200 Subject: [PATCH] [nancy] Update grimani for new environment --- .../clusters/grimani/nodes/grimani-3.json | 26 +++++++++++++++---- .../clusters/grimani/nodes/grimani-5.json | 26 +++++++++++++++---- .../clusters/grimani/nodes/grimani-6.json | 26 +++++++++++++++---- .../clusters/grimani/nodes/grimani-3.yaml | 21 ++++++++++++++- .../clusters/grimani/nodes/grimani-5.yaml | 21 ++++++++++++++- .../clusters/grimani/nodes/grimani-6.yaml | 21 ++++++++++++++- 6 files changed, 123 insertions(+), 18 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json index 6e88a2b10fc..9ced357234e 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json @@ -60,56 +60,72 @@ "device": "eth0", "driver": "ixgbe", "enabled": true, + "firmware_version": "0x800007f4", "interface": "Ethernet", "ip": "172.16.73.3", "kavlan": true, "mac": "24:6e:96:15:46:88", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": true, "mounted": true, + "name": "enp1s0f0", "network_address": "grimani-3.nancy.grid5000.fr", "rate": 10000000000, "switch": "gw-nancy", - "switch_port": "Ethernet6/48" + "switch_port": "Ethernet6/48", + "vendor": "Intel" }, { "bridged": false, "device": "eth1", "driver": "ixgbe", "enabled": false, + "firmware_version": "0x800007f4", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:15:46:8a", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": false, "mounted": false, - "rate": 10000000000 + "name": "enp1s0f1", + "rate": 10000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth2", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:15:46:8c", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f0", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth3", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:15:46:8d", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f1", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, @@ -183,9 +199,9 @@ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0", "device": "sda", "driver": "megaraid_sas", + "firmware_version": "NA02", "interface": "SATA", "model": "ST1000NX0423", - "rev": "NA02", "size": 1000204886016, "storage": "HDD", "vendor": "Seagate" diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json index 1d0eeae97b1..de433474dbb 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json @@ -60,56 +60,72 @@ "device": "eth0", "driver": "ixgbe", "enabled": true, + "firmware_version": "0x800007f4", "interface": "Ethernet", "ip": "172.16.73.5", "kavlan": true, "mac": "24:6e:96:16:5c:e8", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": true, "mounted": true, + "name": "enp1s0f0", "network_address": "grimani-5.nancy.grid5000.fr", "rate": 10000000000, "switch": "gw-nancy", - "switch_port": "Ethernet6/45" + "switch_port": "Ethernet6/45", + "vendor": "Intel" }, { "bridged": false, "device": "eth1", "driver": "ixgbe", "enabled": false, + "firmware_version": "0x800007f4", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:ea", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": false, "mounted": false, - "rate": 10000000000 + "name": "enp1s0f1", + "rate": 10000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth2", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:ec", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f0", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth3", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:ed", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f1", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, @@ -183,9 +199,9 @@ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0", "device": "sda", "driver": "megaraid_sas", + "firmware_version": "NA02", "interface": "SATA", "model": "ST1000NX0423", - "rev": "NA02", "size": 1000204886016, "storage": "HDD", "vendor": "Seagate" diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json index f6729f66d55..df981f9769d 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json @@ -60,56 +60,72 @@ "device": "eth0", "driver": "ixgbe", "enabled": true, + "firmware_version": "0x800007f4", "interface": "Ethernet", "ip": "172.16.73.6", "kavlan": true, "mac": "24:6e:96:16:5c:30", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": true, "mounted": true, + "name": "enp1s0f0", "network_address": "grimani-6.nancy.grid5000.fr", "rate": 10000000000, "switch": "gw-nancy", - "switch_port": "Ethernet6/44" + "switch_port": "Ethernet6/44", + "vendor": "Intel" }, { "bridged": false, "device": "eth1", "driver": "ixgbe", "enabled": false, + "firmware_version": "0x800007f4", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:32", "management": false, + "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection", "mountable": false, "mounted": false, - "rate": 10000000000 + "name": "enp1s0f1", + "rate": 10000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth2", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:34", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f0", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, "device": "eth3", "driver": "igb", "enabled": false, + "firmware_version": "1.67, 0x80000d26, 17.5.10", "interface": "Ethernet", "kavlan": false, "mac": "24:6e:96:16:5c:35", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": false, "mounted": false, - "rate": 1000000000 + "name": "enp6s0f1", + "rate": 1000000000, + "vendor": "Intel" }, { "bridged": false, @@ -183,9 +199,9 @@ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0", "device": "sda", "driver": "megaraid_sas", + "firmware_version": "NA02", "interface": "SATA", "model": "ST1000NX0423", - "rev": "NA02", "size": 1000204886016, "storage": "HDD", "vendor": "Seagate" diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml index 5e2eb34a3ee..bec610d1b44 100644 --- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml +++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml @@ -26,26 +26,45 @@ grimani-3: management: true eth0: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet ip: 172.16.73.3 mac: 24:6e:96:15:46:88 management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f0 rate: 10000000000 + vendor: Intel eth1: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet mac: 24:6e:96:15:46:8a management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f1 + rate: 0 + vendor: Intel eth2: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:15:46:8c management: false + model: I350 Gigabit Network Connection + name: enp6s0f0 + rate: 0 + vendor: Intel eth3: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:15:46:8d management: false + model: I350 Gigabit Network Connection + name: enp6s0f1 + rate: 0 + vendor: Intel operating_system: cstate_driver: intel_idle cstate_governor: menu @@ -73,8 +92,8 @@ grimani-3: sda: by_id: "/dev/disk/by-id/wwn-0x5000c5008cd099ab" by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0" + firmware_version: NA02 model: ST1000NX0423 - rev: NA02 size: 1000204886016 vendor: Seagate supported_job_types: diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml index 01dc6f8fcc5..27512e57157 100644 --- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml +++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml @@ -26,26 +26,45 @@ grimani-5: management: true eth0: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet ip: 172.16.73.5 mac: 24:6e:96:16:5c:e8 management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f0 rate: 10000000000 + vendor: Intel eth1: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet mac: 24:6e:96:16:5c:ea management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f1 + rate: 0 + vendor: Intel eth2: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:16:5c:ec management: false + model: I350 Gigabit Network Connection + name: enp6s0f0 + rate: 0 + vendor: Intel eth3: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:16:5c:ed management: false + model: I350 Gigabit Network Connection + name: enp6s0f1 + rate: 0 + vendor: Intel operating_system: cstate_driver: intel_idle cstate_governor: menu @@ -73,8 +92,8 @@ grimani-5: sda: by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0bade" by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0" + firmware_version: NA02 model: ST1000NX0423 - rev: NA02 size: 1000204886016 vendor: Seagate supported_job_types: diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml index 7d5ea04d328..6e37c6137cc 100644 --- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml +++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml @@ -26,26 +26,45 @@ grimani-6: management: true eth0: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet ip: 172.16.73.6 mac: 24:6e:96:16:5c:30 management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f0 rate: 10000000000 + vendor: Intel eth1: driver: ixgbe + firmware_version: '0x800007f4' interface: Ethernet mac: 24:6e:96:16:5c:32 management: false + model: 82599ES 10-Gigabit SFI/SFP+ Network Connection + name: enp1s0f1 + rate: 0 + vendor: Intel eth2: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:16:5c:34 management: false + model: I350 Gigabit Network Connection + name: enp6s0f0 + rate: 0 + vendor: Intel eth3: driver: igb + firmware_version: 1.67, 0x80000d26, 17.5.10 interface: Ethernet mac: 24:6e:96:16:5c:35 management: false + model: I350 Gigabit Network Connection + name: enp6s0f1 + rate: 0 + vendor: Intel operating_system: cstate_driver: intel_idle cstate_governor: menu @@ -73,8 +92,8 @@ grimani-6: sda: by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0b091" by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0" + firmware_version: NA02 model: ST1000NX0423 - rev: NA02 size: 1000204886016 vendor: Seagate supported_job_types: -- GitLab