From fafe30261d9057e63fe6c029885dbba3ce442de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= Date: Thu, 9 May 2013 19:58:30 +0200 Subject: [PATCH] [grenoble] adonis - values from g5kchecks --- .../clusters/adonis/nodes/adonis-1.json | 61 +- .../clusters/adonis/nodes/adonis-10.json | 61 +- .../clusters/adonis/nodes/adonis-2.json | 61 +- .../clusters/adonis/nodes/adonis-3.json | 61 +- .../clusters/adonis/nodes/adonis-4.json | 61 +- .../clusters/adonis/nodes/adonis-5.json | 61 +- .../clusters/adonis/nodes/adonis-6.json | 61 +- .../clusters/adonis/nodes/adonis-7.json | 61 +- .../clusters/adonis/nodes/adonis-8.json | 61 +- .../clusters/adonis/nodes/adonis-9.json | 61 +- .../input/sites/grenoble/clusters/adonis.rb | 193 ++--- .../input/sites/grenoble/clusters/adonis.yaml | 680 +++++++++++++++--- 12 files changed, 1039 insertions(+), 444 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json index 006412fc27..c9dbf78e85 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJP-00251" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55", - "interface": "InfiniBand", - "ip": "172.18.18.1", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-1-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.1", + "ip6": "fe80::230:48ff:fecc:7fd8", "mac": "00:30:48:cc:7f:d8", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cc:7f:d9", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55", + "interface": "InfiniBand", + "ip": "172.18.18.1", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-1-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.1", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json index a0add81cc1..59890d5678 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJS-00255" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69", - "interface": "InfiniBand", - "ip": "172.18.18.10", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-10-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.10", + "ip6": "fe80::230:48ff:fecc:8310", "mac": "00:30:48:cc:83:10", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cc:83:11", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69", + "interface": "InfiniBand", + "ip": "172.18.18.10", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-10-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.10", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json index e29950f1d6..b65f84475e 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJS-00251" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59", - "interface": "InfiniBand", - "ip": "172.18.18.2", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-2-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.2", + "ip6": "fe80::230:48ff:fecc:7fda", "mac": "00:30:48:cc:7f:da", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cc:7f:db", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59", + "interface": "InfiniBand", + "ip": "172.18.18.2", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-2-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.2", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json index 7e10164c91..c89522b2c3 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJP-00252" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49", - "interface": "InfiniBand", - "ip": "172.18.18.3", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-3-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.3", + "ip6": "fe80::230:48ff:fecd:c6a4", "mac": "00:30:48:cd:c6:a4", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cd:c6:a5", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49", + "interface": "InfiniBand", + "ip": "172.18.18.3", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-3-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.3", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json index d0ea28f703..b7ddd68940 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJS-00252" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45", - "interface": "InfiniBand", - "ip": "172.18.18.4", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-4-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.4", + "ip6": "fe80::230:48ff:fecd:c0ac", "mac": "00:30:48:cd:c0:ac", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cd:c0:ad", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": false, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45", + "interface": "InfiniBand", + "ip": "172.18.18.4", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-4-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.4", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json index 555bb8b155..6de54bc571 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJP-00253" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65", - "interface": "InfiniBand", - "ip": "172.18.18.5", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-5-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.5", + "ip6": "fe80::230:48ff:fecc:7e0a", "mac": "00:30:48:cc:7e:0a", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cc:7e:0b", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65", + "interface": "InfiniBand", + "ip": "172.18.18.5", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-5-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.5", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2267000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json index ae61394834..e2e7c834d2 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJS-00253" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65", - "interface": "InfiniBand", - "ip": "172.18.18.6", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-6-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.6", + "ip6": "fe80::230:48ff:fecc:7abc", "mac": "00:30:48:cc:7a:bc", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cc:7a:bd", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65", + "interface": "InfiniBand", + "ip": "172.18.18.6", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-6-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.6", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json index 05223a905e..72e0db9aec 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJP-00254" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41", - "interface": "InfiniBand", - "ip": "172.18.18.7", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-7-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.7", + "ip6": "fe80::230:48ff:fecd:c680", "mac": "00:30:48:cd:c6:80", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cd:c6:81", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41", + "interface": "InfiniBand", + "ip": "172.18.18.7", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-7-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.7", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json index b0e7216e06..f8a141f437 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": "XAN-SMJS-00254" }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51", - "interface": "InfiniBand", - "ip": "172.18.18.8", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-8-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.8", + "ip6": "fe80::230:48ff:fecd:c0ae", "mac": "00:30:48:cd:c0:ae", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cd:c0:af", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51", + "interface": "InfiniBand", + "ip": "172.18.18.8", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-8-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.8", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2267000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json index 7d91c67031..5356e0221e 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json @@ -10,6 +10,7 @@ "version": "R4222X52" }, "chassis": { + "manufacturer": "Bull SAS", "name": "bullx R422E2-IBQ", "serial": null }, @@ -19,28 +20,13 @@ "gpu_model": "Tesla-C1060" }, "main_memory": { - "ram_size": 25769803776, + "ram_size": 25330180096, "virtual_size": null }, "monitoring": { "wattmeter": false }, "network_adapters": [ - { - "device": "ib0", - "driver": "mlx4_core", - "enabled": true, - "guid": null, - "interface": "InfiniBand", - "ip": "172.18.18.9", - "management": false, - "mountable": true, - "mounted": true, - "network_address": "adonis-9-ib0.grenoble.grid5000.fr", - "rate": 40000000000, - "vendor": "Mellanox", - "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" - }, { "bridged": true, "device": "eth0", @@ -48,6 +34,7 @@ "enabled": true, "interface": "Ethernet", "ip": "172.16.18.9", + "ip6": "fe80::225:90ff:fe4c:e984", "mac": "00:25:90:4c:e9:84", "management": false, "mountable": true, @@ -60,7 +47,9 @@ "version": "Device 10c9 (rev 01)" }, { + "bridged": false, "device": "eth1", + "driver": "igb", "enabled": false, "interface": "Ethernet", "mac": "00:30:48:cb:cf:7f", @@ -72,6 +61,22 @@ "version": "Device 10c9 (rev 01)" }, { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "guid": null, + "interface": "InfiniBand", + "ip": "172.18.18.9", + "management": false, + "mountable": true, + "mounted": true, + "network_address": "adonis-9-ib0.grenoble.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox", + "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s" + }, + { + "device": "bmc", "enabled": true, "interface": "Ethernet", "ip": "172.17.18.9", @@ -86,10 +91,10 @@ } ], "operating_system": { - "kernel": "2.6.32", - "name": "Debian", + "kernel": "2.6.32-5-amd64", + "name": "debian", "release": "Squeeze", - "version": "6.0" + "version": "6.0.6" }, "performance": { "core_flops": 7139000000, @@ -97,22 +102,26 @@ }, "processor": { "cache_l1": null, - "cache_l1d": null, - "cache_l1i": null, - "cache_l2": null, - "clock_speed": 2260000000.0, - "instruction_set": "", + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 8388608, + "clock_speed": 2266000000, + "instruction_set": "x86-64", "model": "Intel Xeon", - "other_description": "", + "other_description": "Intel(R) Xeon(R) CPU E5520 @ 2.27GHz", "vendor": "Intel", "version": "E5520" }, "storage_devices": [ { + "device": "sda", "driver": "ahci", "interface": "SATA", "model": "WD2502ABYS-0", - "size": 232830643653.87 + "rev": 2.0, + "size": "251059544064B", + "vendor": "Western Digital" } ], "supported_job_types": { diff --git a/generators/input/sites/grenoble/clusters/adonis.rb b/generators/input/sites/grenoble/clusters/adonis.rb index b53f5c39cf..1718886771 100644 --- a/generators/input/sites/grenoble/clusters/adonis.rb +++ b/generators/input/sites/grenoble/clusters/adonis.rb @@ -1,127 +1,152 @@ site :grenoble do |site_uid| - cluster :adonis do |cluster_uid| + cluster :adonis do |cluster_uid| + model "Bull R422-E2 dual mobo + Tesla S1070" created_at Time.parse("2010-09-02").httpdate kavlan false + 10.times do |i| - model "Bull R422-E2 dual mobo + Tesla S1070" node "#{cluster_uid}-#{i+1}" do |node_uid| - supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"}) + performance({ - :core_flops => 7139000000, - :node_flops => 55510000000 + :core_flops => 7139000000, + :node_flops => 55510000000 + }) + + supported_job_types({ + :deploy => true, + :besteffort => true, + :virtual => lookup('adonis', node_uid, 'supported_job_types', 'virtual') }) + architecture({ - :smp_size => 2, - :smt_size => 8, - :platform_type => "x86_64" + :smp_size => lookup('adonis', node_uid, 'architecture', 'smp_size'), + :smt_size => lookup('adonis', node_uid, 'architecture', 'smt_size'), + :platform_type => lookup('adonis', node_uid, 'architecture', 'platform_type') }) + processor({ - :vendor => "Intel", - :model => "Intel Xeon", - :version => "E5520", - :clock_speed => 2.26.G, - :instruction_set => "", - :other_description => "", - :cache_l1 => nil, - :cache_l1i => nil, - :cache_l1d => nil, - :cache_l2 => nil + :vendor => lookup('adonis', node_uid, 'processor', 'vendor'), + :model => lookup('adonis', node_uid, 'processor', 'model'), + :version => lookup('adonis', node_uid, 'processor', 'version'), + :clock_speed => lookup('adonis', node_uid, 'processor', 'clock_speed'), + :instruction_set => lookup('adonis', node_uid, 'processor', 'instruction_set'), + :other_description => lookup('adonis', node_uid, 'processor', 'other_description'), + :cache_l1 => lookup('adonis', node_uid, 'processor', 'cache_l1'), + :cache_l1i => lookup('adonis', node_uid, 'processor', 'cache_l1i'), + :cache_l1d => lookup('adonis', node_uid, 'processor', 'cache_l1d'), + :cache_l2 => lookup('adonis', node_uid, 'processor', 'cache_l2'), + :cache_l3 => lookup('adonis', node_uid, 'processor', 'cache_l3') }) + main_memory({ - :ram_size => 24.GiB, # bytes + :ram_size => lookup('adonis', node_uid, 'main_memory', 'ram_size'), :virtual_size => nil }) + operating_system({ - :name => "Debian", - :release => "Squeeze", - :version => "6.0", - :kernel => "2.6.32" + :name => lookup('adonis', node_uid, 'operating_system', 'name'), + :release => "Squeeze", + :version => lookup('adonis', node_uid, 'operating_system', 'version'), + :kernel => lookup('adonis', node_uid, 'operating_system', 'kernel') }) + storage_devices [{ - :interface => 'SATA', - :size => 250.GB, - :driver => "ahci", - :model => lookup('adonis', node_uid, 'block_devices', 'sda', 'model') + :interface => 'SATA', + :size => lookup('adonis', node_uid, 'block_devices', 'sda', 'size'), + :driver => "ahci", + :device => lookup('adonis', node_uid, 'block_devices', 'sda', 'device'), + :model => lookup('adonis', node_uid, 'block_devices', 'sda', 'model'), + :vendor => lookup('adonis', node_uid, 'block_devices', 'sda', 'vendor'), + :rev => lookup('adonis', node_uid, 'block_devices', 'sda', 'rev') }] + network_adapters [{ - :interface => 'InfiniBand', - :rate => 40.G, - :device => "ib0", - :enabled => true, - :mounted => true, - :mountable => true, - :management => false, - :vendor => 'Mellanox', - :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s", - :driver => "mlx4_core", - :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", - :ip => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip'), - :guid => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'guid') + :interface => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'interface'), + :rate => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'rate'), + :enabled => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'enabled'), + :management => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'management'), + :mountable => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mountable'), + :mounted => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mounted'), + :bridged => true, + :device => "eth0", + :vendor => 'Intel', + :version => "Device 10c9 (rev 01)", + :driver => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'driver'), + :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", + :ip => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'), + :ip6 => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip6'), + :switch => "gw-grenoble", + :switch_port => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_port'), + :mac => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac') }, { - :interface => 'Ethernet', - :rate => 1.G, - :device => "eth0", - :enabled => true, - :mounted => true, - :mountable => true, - :bridged => true, - :management => false, - :vendor => 'Intel', - :version => "Device 10c9 (rev 01)", - :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", - :ip => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'), - :mac => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac'), - :driver => "igb", - :switch => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_name'), - :switch_port => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_port') - + :interface => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'interface'), + :rate => 1.G, + :enabled => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'enabled'), + :management => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'management'), + :mountable => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mountable'), + :mounted => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mounted'), + :bridged => false, + :device => "eth1", + :vendor => 'Intel', + :version => "Device 10c9 (rev 01)", + :driver => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'driver'), + :mac => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mac') }, { - :interface => 'Ethernet', - :rate => 1.G, - :device => "eth1", - :enabled => false, - :mountable => false, - :mounted => false, - :management => false, - :vendor => 'Intel', - :version => "Device 10c9 (rev 01)", - :mac => lookup('adonis', node_uid, 'network_interfaces', 'eth1', 'mac'), + :interface => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'interface'), + :rate => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'rate'), + :device => "ib0", + :enabled => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'enabled'), + :management => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'management'), + :mountable => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mountable'), + :mounted => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'mounted'), + :vendor => 'Mellanox', + :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s", + :driver => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'driver'), + :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", + :ip => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'ip'), + :guid => lookup('adonis', node_uid, 'network_interfaces', 'ib0', 'guid') }, { - :interface => 'Ethernet', - :rate => 1.G, - :enabled => true, - :mounted => false, - :mountable => false, - :management => true, - :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr", - :ip => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'ip'), - :mac => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'mac'), - :vendor => 'Super Micro Computer Inc.', - :version => "1.15" + :interface => 'Ethernet', + :rate => 1.G, + :enabled => true, + :management => true, + :mountable => false, + :mounted => false, + :device => "bmc", + :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr", + :ip => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'ip'), + :vendor => 'Super Micro Computer Inc.', + :version => "1.15", + :mac => lookup('adonis', node_uid, 'network_interfaces', 'bmc', 'mac') }] + + chassis({ + :serial => lookup('adonis', node_uid, 'chassis', 'serial_number'), + :name => lookup('adonis', node_uid, 'chassis', 'product_name'), + :manufacturer => lookup('adonis', node_uid, 'chassis', 'manufacturer') + }) + bios({ :version => lookup('adonis', node_uid, 'bios', 'version'), :vendor => lookup('adonis', node_uid, 'bios', 'vendor'), :release_date => lookup('adonis', node_uid, 'bios', 'release_date') }) - chassis({ - :serial => lookup('adonis', node_uid, 'chassis', 'serial_number'), - :name => lookup('adonis', node_uid, 'chassis', 'product_name') - }) + gpu({ :gpu => true, :gpu_count => lookup('adonis', node_uid, 'gpu', 'gpu_count'), :gpu_model => lookup('adonis', node_uid, 'gpu', 'gpu_model'), - }) + }) + monitoring({ :wattmeter => false }) + end end end - end diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis.yaml index 7292c1ef08..a723e19ba3 100644 --- a/generators/input/sites/grenoble/clusters/adonis.yaml +++ b/generators/input/sites/grenoble/clusters/adonis.yaml @@ -1,3 +1,4 @@ +--- adonis-1: bios: version: R4222X52 @@ -6,26 +7,74 @@ adonis-1: block_devices: sda: model: WD2502ABYS-0 - size: 251.GB + device: sda + size: 251059544064B + rev: 2.0 vendor: Western Digital - chassis: - serial_number: XAN-SMJP-00251 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:1755 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.1 - bmc: - mac: 00:30:48:cc:b0:58 - ip: 172.17.18.1 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cc:7f:d8 + ip6: fe80::230:48ff:fecc:7fd8 + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.1 switch_name: gw-grenoble switch_port: Gi3/11 eth1: + mounted: false mac: 00:30:48:cc:7f:d9 + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b0:58 + ip: 172.17.18.1 + chassis: + serial_number: XAN-SMJP-00251 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + main_memory: + ram_size: 25330180096 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -37,26 +86,74 @@ adonis-2: block_devices: sda: model: WD2502ABYS-0 - size: 251.GB + device: sda + size: 251059544064B + rev: 2.0 vendor: Western Digital - chassis: - serial_number: XAN-SMJS-00251 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:1759 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.2 - bmc: - mac: 00:30:48:cc:b0:59 - ip: 172.17.18.2 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cc:7f:da + ip6: fe80::230:48ff:fecc:7fda + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.2 switch_name: gw-grenoble switch_port: Gi3/12 eth1: + mounted: false mac: 00:30:48:cc:7f:db + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b0:59 + ip: 172.17.18.2 + supported_job_types: + virtual: ivt + chassis: + serial_number: XAN-SMJS-00251 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + main_memory: + ram_size: 25330180096 + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -65,29 +162,77 @@ adonis-3: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. - block_devices: - sda: - model: WD2502ABYS-0 - size: 251.GB - vendor: Western Digital - chassis: - serial_number: XAN-SMJP-00252 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:3d49 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.3 - bmc: - mac: 00:30:48:cc:b5:f6 - ip: 172.17.18.3 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cd:c6:a4 + ip6: fe80::230:48ff:fecd:c6a4 + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.3 switch_name: gw-grenoble switch_port: Gi3/13 eth1: + mounted: false mac: 00:30:48:cd:c6:a5 + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b5:f6 + ip: 172.17.18.3 + block_devices: + sda: + model: WD2502ABYS-0 + device: sda + size: 251059544064B + rev: 2.0 + vendor: Western Digital + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 + supported_job_types: + virtual: ivt + chassis: + serial_number: XAN-SMJP-00252 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + main_memory: + ram_size: 25330180096 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -99,26 +244,73 @@ adonis-4: block_devices: sda: model: WD2502ABYS-0 - size: 251.GB + device: sda + size: 251059544064B + rev: 2.0 vendor: Western Digital - chassis: - serial_number: XAN-SMJS-00252 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45 + rate: 40000000000 + management: false + enabled: false + interface: InfiniBand + version: MT26428 ip: 172.18.18.4 - bmc: - mac: 00:30:48:cc:b6:6c - ip: 172.17.18.4 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cd:c0:ac + ip6: fe80::230:48ff:fecd:c0ac + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.4 switch_name: gw-grenoble switch_port: Gi3/14 eth1: + mounted: false mac: 00:30:48:cd:c0:ad + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b6:6c + ip: 172.17.18.4 + supported_job_types: + virtual: ivt + chassis: + serial_number: XAN-SMJS-00252 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + main_memory: + ram_size: 25330180096 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -127,29 +319,77 @@ adonis-5: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. - block_devices: - sda: - model: WD2502ABYS-0 - size: 251.GB - vendor: Western Digital - chassis: - serial_number: XAN-SMJP-00253 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:1465 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.5 - bmc: - mac: 00:30:48:cc:af:61 - ip: 172.17.18.5 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cc:7e:0a + ip6: fe80::230:48ff:fecc:7e0a + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.5 switch_name: gw-grenoble switch_port: Gi3/15 eth1: + mounted: false mac: 00:30:48:cc:7e:0b + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:af:61 + ip: 172.17.18.5 + block_devices: + sda: + model: WD2502ABYS-0 + device: sda + size: 251059544064B + rev: 2.0 + vendor: Western Digital + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 + chassis: + serial_number: XAN-SMJP-00253 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2267000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + main_memory: + ram_size: 25330180096 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -158,29 +398,77 @@ adonis-6: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. - block_devices: - sda: - model: WD2502ABYS-0 - size: 251.GB - vendor: Western Digital - chassis: - serial_number: XAN-SMJS-00253 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:4265 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.6 - bmc: - mac: 00:30:48:cc:ad:f2 - ip: 172.17.18.6 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cc:7a:bc + ip6: fe80::230:48ff:fecc:7abc + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.6 switch_name: gw-grenoble switch_port: Gi3/16 eth1: + mounted: false mac: 00:30:48:cc:7a:bd + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:ad:f2 + ip: 172.17.18.6 + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 + block_devices: + sda: + model: WD2502ABYS-0 + device: sda + size: 251059544064B + rev: 2.0 + vendor: Western Digital + chassis: + serial_number: XAN-SMJS-00253 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + main_memory: + ram_size: 25330180096 + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -192,26 +480,74 @@ adonis-7: block_devices: sda: model: WD2502ABYS-0 - size: 251.GB + device: sda + size: 251059544064B + rev: 2.0 vendor: Western Digital - chassis: - serial_number: XAN-SMJP-00254 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:3d41 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.7 - bmc: - mac: 00:30:48:cc:b5:e4 - ip: 172.17.18.7 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cd:c6:80 + ip6: fe80::230:48ff:fecd:c680 + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.7 switch_name: gw-grenoble switch_port: Gi3/17 eth1: + mounted: false mac: 00:30:48:cd:c6:81 + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b5:e4 + ip: 172.17.18.7 + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 + chassis: + serial_number: XAN-SMJP-00254 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + main_memory: + ram_size: 25330180096 + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -220,29 +556,77 @@ adonis-8: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 block_devices: sda: model: WD2502ABYS-0 - size: 251.GB + device: sda + size: 251059544064B + rev: 2.0 vendor: Western Digital - chassis: - serial_number: XAN-SMJS-00254 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:3d51 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.8 - bmc: - mac: 00:30:48:cc:b6:6d - ip: 172.17.18.8 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cd:c0:ae + ip6: fe80::230:48ff:fecd:c0ae + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.8 switch_name: gw-grenoble switch_port: Gi3/18 eth1: + mounted: false mac: 00:30:48:cd:c0:af + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:b6:6d + ip: 172.17.18.8 + chassis: + serial_number: XAN-SMJS-00254 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2267000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + main_memory: + ram_size: 25330180096 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -251,29 +635,77 @@ adonis-9: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. - block_devices: - sda: - model: WD2502ABYS-0 - size: 251.GB - vendor: Western Digital - chassis: - serial_number: - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ network_interfaces: ib0: + mounted: true guid: + rate: 40000000000 + ip6: fe80::225:90ff:ff2f:f149 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.9 - bmc: - mac: 00:25:90:4b:bd:b1 - ip: 172.17.18.9 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:25:90:4c:e9:84 + ip6: fe80::225:90ff:fe4c:e984 + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.9 switch_name: gw-grenoble switch_port: Gi3/19 eth1: + mounted: false mac: 00:30:48:cb:cf:7f + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:25:90:4b:bd:b1 + ip: 172.17.18.9 + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 + block_devices: + sda: + model: WD2502ABYS-0 + device: sda + size: 251059544064B + rev: 2.0 + vendor: Western Digital + chassis: + serial_number: + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + main_memory: + ram_size: 25330180096 + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 @@ -282,29 +714,77 @@ adonis-10: version: R4222X52 release_date: (09/23/2009) vendor: American Megatrends Inc. - block_devices: - sda: - model: WD2502ABYS-0 - size: 251.GB - vendor: Western Digital - chassis: - serial_number: XAN-SMJS-00255 - manufacturer: Bull SAS - product_name: bullx R422E2-IBQ + operating_system: + kernel: 2.6.32-5-amd64 + name: debian + version: 6.0.6 network_interfaces: ib0: + mounted: true guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69 + rate: 40000000000 + ip6: fe80::230:48ff:ffcc:1769 + management: false + enabled: true + interface: InfiniBand + version: MT26428 ip: 172.18.18.10 - bmc: - mac: 00:30:48:cc:ad:df - ip: 172.17.18.10 + driver: mlx4_core + mountable: true eth0: + mounted: true + rate: 1000000000 mac: 00:30:48:cc:83:10 + ip6: fe80::230:48ff:fecc:8310 + management: false + enabled: true + interface: Ethernet + driver: igb + mountable: true ip: 172.16.18.10 switch_name: gw-grenoble switch_port: Gi3/20 eth1: + mounted: false mac: 00:30:48:cc:83:11 + management: false + enabled: false + interface: Ethernet + driver: igb + mountable: false + bmc: + mac: 00:30:48:cc:ad:df + ip: 172.17.18.10 + block_devices: + sda: + model: WD2502ABYS-0 + device: sda + size: 251059544064B + rev: 2.0 + vendor: Western Digital + chassis: + serial_number: XAN-SMJS-00255 + manufacturer: Bull SAS + product_name: bullx R422E2-IBQ + supported_job_types: + virtual: ivt + main_memory: + ram_size: 25330180096 + processor: + model: Intel Xeon + cache_l1d: 32768 + clock_speed: 2266000000 + other_description: Intel(R) Xeon(R) CPU E5520 @ 2.27GHz + version: E5520 + cache_l2: 262144 + cache_l3: 8388608 + vendor: Intel + instruction_set: x86-64 + cache_l1i: 32768 + architecture: + smp_size: 2 + platform_type: x86_64 + smt_size: 8 gpu: gpu_count: 2 gpu_model: Tesla-C1060 -- GitLab