diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json index 05636c7dd2d733b648c7e3898c43d0849c9d75f0..dd2f70dc8cb766f9b4a0ab95ecb0e32016b0f5d0 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json index 47679db4d0b287ae6b6bd18603f92bd0073ac6fc..953a31e8a1d36fe42c3e05ef8cdc3366ef404131 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json index 7798c3eeafb805942cce1e856e4c099a2192675e..c5486311d1be2c03fc032b9e65c7391cc4d4b6ea 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json index 69b9b810cf5e3ebca8c254438915e78329071d2b..11d678e4c1ceaa2d312a829c2a0cf1ffbeb45613 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json index 46e18c4816a55641fe7c08b08e85e84c181cdb36..e4f823f32a359e2d35db032cf3c461b2d8d32f70 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json index 25a8d54ff265c50cdb910f5aaa2503b052ff2393..57a411c89b3f8d1e2f4e45301dd664e9ced19245 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json index d26d125bde5e6015fc43ca90130f32a56d83f029..6effd95b29e9d953744953c31b08d614df0a78ab 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json index db4d8abde3264b24a914a736758b2a2f283e632b..197b44a7cf12542fe270c8d97e7d445aeb488c46 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json @@ -203,9 +203,9 @@ "device": "sda", "driver": "megaraid_sas", "interface": "SCSI", - "model": "PX02SSF020", - "rev": "A4AF", - "size": 200049647616, + "model": "ST600MM0088", + "rev": "TT31", + "size": 600127266816, "storage": "HDD", "vendor": "LSI Logic / Symbios Logic" }, @@ -253,11 +253,11 @@ "device": "sdf", "driver": "megaraid_sas", "interface": "SCSI", - "model": "ST600MM0088", - "rev": "TT31", - "size": 600127266816, - "storage": "HDD", - "vendor": "LSI Logic / Symbios Logic" + "model": "PX02SSF020", + "rev": "A4AF", + "size": 200049647616, + "storage": "SSD", + "vendor": "TOSHIBA" } ], "supported_job_types": { diff --git a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb index 3c616599f6090e4ad41a0e614d24a8d1fe9db5f8..2b6ddf22b0f6dd7a636382c7725231b131dc3cc5 100644 --- a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb +++ b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb @@ -109,9 +109,9 @@ site :nancy do |site_uid| :driver => "megaraid_sas", :device => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'device'), :model => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'model'), - :vendor => 'LSI Logic / Symbios Logic', + :vendor => 'TOSHIBA', :rev => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'rev'), - :storage => 'HDD' + :storage => 'SSD' }] network_adapters [{ diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml index 687dcbdd5e3ec386d19d18fdb24ddec4f1aa96d6..8f1bee018695ac0a375ee52bc74563e739ce997f 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml @@ -15,11 +15,11 @@ grimoire-1: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 266 - timewrite: 1242 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1277 + timewrite: 2800 sdb: device: sdb size: 600127266816 @@ -42,20 +42,14 @@ grimoire-1: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: ram_size: 135291469824 network_interfaces: - eth4: - interface: Ethernet - driver: igb - mac: 24:6e:96:03:0c:cc - mounted: false - management: false eth0: interface: Ethernet ip: 172.16.71.1 @@ -70,16 +64,22 @@ grimoire-1: mac: 24:6e:96:03:0c:ca mounted: false management: false - eth5: + eth2: + interface: Ethernet + driver: ixgbe + mac: a0:36:9f:7f:35:b8 + mounted: false + management: false + eth4: interface: Ethernet driver: igb - mac: 24:6e:96:03:0c:cd + mac: 24:6e:96:03:0c:cc mounted: false management: false - eth2: + eth5: interface: Ethernet - driver: ixgbe - mac: a0:36:9f:7f:35:b8 + driver: igb + mac: 24:6e:96:03:0c:cd mounted: false management: false eth3: diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml index 6df816fffe5e276fc4073def837fb406198228cd..77c8a624bb78f98539d4e5f52a789f2aba83be70 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml @@ -15,11 +15,11 @@ grimoire-2: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 267 - timewrite: 1226 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1289 + timewrite: 2889 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-2: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: @@ -64,18 +64,18 @@ grimoire-2: rate: 10000000000 mounted: true management: false - eth1: - interface: Ethernet - driver: ixgbe - mac: 24:6e:96:03:24:7a - mounted: false - management: false eth5: interface: Ethernet driver: igb mac: 24:6e:96:03:24:7d mounted: false management: false + eth1: + interface: Ethernet + driver: ixgbe + mac: 24:6e:96:03:24:7a + mounted: false + management: false eth2: interface: Ethernet driver: ixgbe diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml index 4c788189dc3d55f9f779843aa3bf1696dbd56ecf..7418b2bfcf6bc6cd954b73f4e01a24a922df6bec 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml @@ -15,11 +15,11 @@ grimoire-3: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 268 - timewrite: 1238 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1256 + timewrite: 2713 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-3: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: @@ -56,12 +56,6 @@ grimoire-3: mac: 24:6e:96:03:20:f4 mounted: false management: false - eth5: - interface: Ethernet - driver: igb - mac: 24:6e:96:03:20:f5 - mounted: false - management: false eth0: interface: Ethernet ip: 172.16.71.3 @@ -70,6 +64,12 @@ grimoire-3: rate: 10000000000 mounted: true management: false + eth5: + interface: Ethernet + driver: igb + mac: 24:6e:96:03:20:f5 + mounted: false + management: false eth1: interface: Ethernet driver: ixgbe diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml index fe00393d92422c0becc555b15b80383a6cd1b692..09ef361f0ed617c876c074a235c393ff9e3bc82a 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml @@ -15,11 +15,11 @@ grimoire-4: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 268 - timewrite: 1231 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1305 + timewrite: 2951 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-4: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml index 3ae4713a207f9662ad95fa70bf01ee6e92162b02..ee6d0f82ea6390422f7f38e1d892b723e0ffd831 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml @@ -15,11 +15,11 @@ grimoire-5: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 267 - timewrite: 1228 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1266 + timewrite: 2907 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-5: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: @@ -64,12 +64,6 @@ grimoire-5: rate: 10000000000 mounted: true management: false - eth5: - interface: Ethernet - driver: igb - mac: 24:6e:96:02:96:95 - mounted: false - management: false eth1: interface: Ethernet driver: ixgbe @@ -82,6 +76,12 @@ grimoire-5: mac: a0:36:9f:7e:4c:ac mounted: false management: false + eth5: + interface: Ethernet + driver: igb + mac: 24:6e:96:02:96:95 + mounted: false + management: false eth3: interface: Ethernet driver: ixgbe diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml index c7ec956e6f3f4b5a6b65835ad6fdbcb2dab51af0..50f31077493af972217a84ecec6ea3d64a331afa 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml @@ -15,11 +15,11 @@ grimoire-6: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 265 - timewrite: 1226 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1310 + timewrite: 2993 sdb: device: sdb size: 600127266816 @@ -42,20 +42,14 @@ grimoire-6: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: ram_size: 135291469824 network_interfaces: - eth4: - interface: Ethernet - driver: igb - mac: 24:6e:96:02:a3:8c - mounted: false - management: false eth0: interface: Ethernet ip: 172.16.71.6 @@ -64,16 +58,22 @@ grimoire-6: rate: 10000000000 mounted: true management: false - eth5: + eth1: + interface: Ethernet + driver: ixgbe + mac: 24:6e:96:02:a3:8a + mounted: false + management: false + eth4: interface: Ethernet driver: igb - mac: 24:6e:96:02:a3:8d + mac: 24:6e:96:02:a3:8c mounted: false management: false - eth1: + eth5: interface: Ethernet - driver: ixgbe - mac: 24:6e:96:02:a3:8a + driver: igb + mac: 24:6e:96:02:a3:8d mounted: false management: false eth2: diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml index 0d282ee773d1af9086f2e1feaaea27f000a0ccf3..e50ec965c909dd570a5ca0ab0d20d0433b0873b9 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml @@ -15,11 +15,11 @@ grimoire-7: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 267 - timewrite: 1229 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1277 + timewrite: 2927 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-7: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: @@ -64,18 +64,18 @@ grimoire-7: rate: 10000000000 mounted: true management: false - eth5: - interface: Ethernet - driver: igb - mac: 24:6e:96:02:a9:7d - mounted: false - management: false eth1: interface: Ethernet driver: ixgbe mac: 24:6e:96:02:a9:7a mounted: false management: false + eth5: + interface: Ethernet + driver: igb + mac: 24:6e:96:02:a9:7d + mounted: false + management: false eth2: interface: Ethernet driver: ixgbe diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml index 7af0a771d3b43a1732f0912fc9922b99a565a175..25a969bffd5c4169fee74a04a761d3ee0993c80c 100644 --- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml +++ b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml @@ -15,11 +15,11 @@ grimoire-8: block_devices: sda: device: sda - size: 200049647616 - model: PX02SSF020 - rev: A4AF - timeread: 267 - timewrite: 1235 + size: 600127266816 + model: ST600MM0088 + rev: TT31 + timeread: 1260 + timewrite: 2870 sdb: device: sdb size: 600127266816 @@ -42,9 +42,9 @@ grimoire-8: rev: TT31 sdf: device: sdf - size: 600127266816 - model: ST600MM0088 - rev: TT31 + size: 200049647616 + model: PX02SSF020 + rev: A4AF supported_job_types: virtual: ivt main_memory: