From 9d59d34917afd76e90450d718b5bf3209ecf6ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr> Date: Thu, 31 Mar 2016 11:10:24 +0200 Subject: [PATCH] Updated taurus --- .../lyon/clusters/taurus/nodes/taurus-1.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-10.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-11.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-12.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-13.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-14.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-15.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-16.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-2.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-3.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-4.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-5.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-6.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-7.json | 3 +- .../lyon/clusters/taurus/nodes/taurus-8.json | 5 +- .../lyon/clusters/taurus/nodes/taurus-9.json | 5 +- .../sites/lyon/clusters/hercule/hercule.yaml | 9 ++- .../clusters/hercule/nodes/hercule-1.yaml | 2 +- .../clusters/hercule/nodes/hercule-2.yaml | 2 +- .../clusters/hercule/nodes/hercule-3.yaml | 2 +- .../clusters/hercule/nodes/hercule-4.yaml | 2 +- .../lyon/clusters/orion/nodes/orion-1.yaml | 2 +- .../lyon/clusters/orion/nodes/orion-2.yaml | 2 +- .../lyon/clusters/orion/nodes/orion-3.yaml | 2 +- .../lyon/clusters/orion/nodes/orion-4.yaml | 2 +- .../sites/lyon/clusters/orion/orion.yaml | 6 +- .../sites/lyon/clusters/orion/orion_pdu.yaml | 19 ++++++ .../sites/lyon/clusters/taurus/taurus.yaml | 4 +- .../lyon/clusters/taurus/taurus_pdu.yaml | 67 +++++++++++++++++++ 29 files changed, 129 insertions(+), 56 deletions(-) create mode 100644 dev/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml create mode 100644 dev/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json index 92a1c3ca3df..6ff6e786571 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json index b3d96a7e108..f7d287df60e 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json index 6551d7a8149..6acc6d178f1 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json index 01081c64fe4..1c3364c27d6 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json index 80183c6f733..c51c98145da 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json index 8dd259c427a..17aa1d79290 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json index 655f9d11445..bbb91238a67 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json index f15ca2369db..13486dd76bf 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json index a1143b17162..7794e0481ad 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json index 429fe0fce60..6223d749196 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json index 677efa30d08..20aab0630ad 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json index 4853b3e66fe..60019d8116b 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json index b0f2eb58e36..18082b54d10 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json index 79ca5d3711c..db33fbb6475 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json index e71fa15e087..c73f2567120 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json index b41bda2705c..2d5ce82e15c 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json @@ -18,7 +18,7 @@ "gpu": false }, "main_memory": { - "ram_size": 34359738368, + "ram_size": 33285996544, "virtual_size": null }, "monitoring": { @@ -178,8 +178,7 @@ "model": "PERC H710", "rev": 3.13, "size": 598879502336, - "storage": "HDD", - "vendor": null + "storage": "HDD" } ], "supported_job_types": { diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml index 393e01993e4..7530260385d 100644 --- a/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml @@ -1,7 +1,7 @@ --- model: Dell C6220 -created_at: 2012-10-02 -priority: 201299 +created_at: 2012-10-02 12:00 GMT +priority: '201299' kavlan: true queues: - default @@ -35,6 +35,7 @@ nodes: name: debian release: Jessie version: "8.2" + kernel: 3.16.0-4-amd64 storage_devices: sda: interface: SATA @@ -63,6 +64,7 @@ nodes: vendor: Intel version: 82599EB 10-Gigabit SFI/SFP+ Network Connection eth2: + network_address: none enabled: true mountable: true rate: 100000000 @@ -70,6 +72,7 @@ nodes: vendor: Intel version: Intel Corporation eth3: + network_address: none enabled: true mountable: true rate: 100.0e+6 @@ -84,7 +87,7 @@ nodes: mountable: false management: true monitoring: - wattmeter: shared + wattmeter: false sensors: power: available: true diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml index 196bdaaff1a..661eb42cfea 100644 --- a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml @@ -8,7 +8,7 @@ hercule-1: bios: release_date: 04/26/2012 vendor: Dell Inc. - version: 1.0 + version: 1.0.21 chassis: manufacturer: Dell Inc. name: PowerEdge C6220 diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml index 593109aca39..daf5314225d 100644 --- a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml @@ -8,7 +8,7 @@ hercule-2: bios: release_date: 04/26/2012 vendor: Dell Inc. - version: 1.0 + version: 1.0.21 chassis: manufacturer: Dell Inc. name: PowerEdge C6220 diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml index 85080058cf4..e275034f882 100644 --- a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml @@ -8,7 +8,7 @@ hercule-3: bios: release_date: 04/26/2012 vendor: Dell Inc. - version: 1.0 + version: 1.0.21 chassis: manufacturer: Dell Inc. name: PowerEdge C6220 diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml index e156152bc14..31305b43396 100644 --- a/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml @@ -8,7 +8,7 @@ hercule-4: bios: release_date: 04/26/2012 vendor: Dell Inc. - version: 1.0 + version: 1.0.21 chassis: manufacturer: Dell Inc. name: PowerEdge C6220 diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml index eda6bfcb399..931c6bc9300 100644 --- a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml @@ -8,7 +8,7 @@ orion-1: bios: release_date: 05/10/2012 vendor: Dell Inc. - version: 1.2 + version: 1.2.6 chassis: manufacturer: Dell Inc. name: PowerEdge R720 diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml index 4f057d3f3b8..231fab139f5 100644 --- a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml @@ -8,7 +8,7 @@ orion-2: bios: release_date: 05/10/2012 vendor: Dell Inc. - version: 1.2 + version: 1.2.6 chassis: manufacturer: Dell Inc. name: PowerEdge R720 diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml index 7555638d768..51cd5645d0f 100644 --- a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml @@ -8,7 +8,7 @@ orion-3: bios: release_date: 05/10/2012 vendor: Dell Inc. - version: 1.2 + version: 1.2.6 chassis: manufacturer: Dell Inc. name: PowerEdge R720 diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml index ee53a231e2f..954efeccc16 100644 --- a/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml @@ -8,7 +8,7 @@ orion-4: bios: release_date: 05/10/2012 vendor: Dell Inc. - version: 1.2 + version: 1.2.6 chassis: manufacturer: Dell Inc. name: PowerEdge R720 diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/orion.yaml index 76aaa88071b..f6222d9fa9b 100644 --- a/dev/input/grid5000/sites/lyon/clusters/orion/orion.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/orion/orion.yaml @@ -1,6 +1,6 @@ model: Dell R720 -created_at: 2012-09-14 -priority: 201299 +created_at: 2012-09-14 12:00:00 GMT +priority: '201299' kavlan: true queues: - default @@ -97,7 +97,7 @@ nodes: per_outlets: true via: api: - metric: pdu + metric: power www: url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php gpu: diff --git a/dev/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml b/dev/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml new file mode 100644 index 00000000000..751b7c9ac98 --- /dev/null +++ b/dev/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml @@ -0,0 +1,19 @@ +--- +nodes: + orion-1: + pdu: + uid: wattmetre + port: 0 + orion-2: + pdu: + uid: wattmetre + port: 1 + orion-3: + pdu: + uid: wattmetre + port: 2 + orion-4: + pdu: + uid: wattmetre + port: 3 + \ No newline at end of file diff --git a/dev/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/dev/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml index 725a9baf7d0..a795dd4f569 100644 --- a/dev/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml +++ b/dev/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml @@ -1,6 +1,6 @@ --- model: Dell R720 -created_at: 2012-09-14 +created_at: 2012-09-14 12:00:00 GMT kavlan: true queues: - default @@ -104,7 +104,7 @@ nodes: per_outlets: true via: api: - metric: pdu + metric: power www: url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php diff --git a/dev/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml b/dev/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml new file mode 100644 index 00000000000..9cc836bf643 --- /dev/null +++ b/dev/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml @@ -0,0 +1,67 @@ +--- +nodes: + taurus-1: + pdu: + uid: wattmetre + port: 83 + taurus-10: + pdu: + uid: wattmetre + port: 84 + taurus-11: + pdu: + uid: wattmetre + port: 85 + taurus-12: + pdu: + uid: wattmetre + port: 86 + taurus-13: + pdu: + uid: wattmetre + port: 87 + taurus-14: + pdu: + uid: wattmetre + port: 88 + taurus-15: + pdu: + uid: wattmetre + port: 89 + taurus-16: + pdu: + uid: wattmetre + port: 90 + taurus-2: + pdu: + uid: wattmetre + port: 91 + taurus-3: + pdu: + uid: wattmetre + port: 92 + taurus-4: + pdu: + uid: wattmetre + port: 93 + taurus-5: + pdu: + uid: wattmetre + port: 94 + taurus-6: + pdu: + uid: wattmetre + port: 95 + taurus-7: + pdu: + uid: wattmetre + port: 96 + taurus-8: + pdu: + uid: wattmetre + port: 97 + taurus-9: + pdu: + uid: wattmetre + port: 98 + \ No newline at end of file -- GitLab