diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json
deleted file mode 100644
index 30e03ea83b47c56d967889e65d8efd680c3dc07f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 12,
- "nb_procs": 2,
- "nb_threads": 24,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "12/06/2019",
- "vendor": "Dell Inc.",
- "version": "2.9.0"
- },
- "bmc_version": "2.63.60.62",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge R720",
- "serial": "DHTHD5J"
- },
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.193.14",
- "kavlan-11": "10.7.201.14",
- "kavlan-12": "10.11.201.14",
- "kavlan-13": "10.15.201.14",
- "kavlan-14": "10.19.201.14",
- "kavlan-16": "10.27.201.14",
- "kavlan-18": "10.35.201.14",
- "kavlan-2": "192.168.209.14",
- "kavlan-20": "10.43.201.14",
- "kavlan-21": "10.47.201.14",
- "kavlan-3": "192.168.225.14",
- "kavlan-4": "10.12.1.14",
- "kavlan-5": "10.12.65.14",
- "kavlan-6": "10.12.129.14",
- "kavlan-7": "10.12.193.14",
- "kavlan-8": "10.13.1.14",
- "kavlan-9": "10.13.65.14"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:481:1::e",
- "kavlan-11": "2001:660:4406:48b:1::e",
- "kavlan-12": "2001:660:4406:48c:1::e",
- "kavlan-13": "2001:660:4406:48d:1::e",
- "kavlan-14": "2001:660:4406:48e:1::e",
- "kavlan-16": "2001:660:4406:490:1::e",
- "kavlan-18": "2001:660:4406:492:1::e",
- "kavlan-2": "2001:660:4406:482:1::e",
- "kavlan-20": "2001:660:4406:494:1::e",
- "kavlan-21": "2001:660:4406:495:1::e",
- "kavlan-3": "2001:660:4406:483:1::e",
- "kavlan-4": "2001:660:4406:484:1::e",
- "kavlan-5": "2001:660:4406:485:1::e",
- "kavlan-6": "2001:660:4406:486:1::e",
- "kavlan-7": "2001:660:4406:487:1::e",
- "kavlan-8": "2001:660:4406:488:1::e",
- "kavlan-9": "2001:660:4406:489:1::e"
- }
- },
- "main_memory": {
- "ram_size": 34359738368
- },
- "monitoring": {
- "wattmeter": "true"
- },
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "ixgbe",
- "enabled": true,
- "firmware_version": "0x8000095d, 19.0.12",
- "interface": "Ethernet",
- "ip": "172.16.48.14",
- "ip6": "2001:660:4406:400:1::e",
- "kavlan": true,
- "mac": "a0:36:9f:08:f8:4c",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": true,
- "mounted": true,
- "name": "enp68s0f0",
- "network_address": "taurus-14.lyon.grid5000.fr",
- "rate": 10000000000,
- "switch": "force10",
- "switch_port": "TenGigabitEthernet 0/14",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "ixgbe",
- "enabled": false,
- "firmware_version": "0x8000095d, 19.0.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "a0:36:9f:08:f8:4e",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": false,
- "mounted": false,
- "name": "enp68s0f1",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.0.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:30:64",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno1",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth3",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.0.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:30:65",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth4",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.0.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:30:66",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno3",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth5",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.0.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:30:67",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno4",
- "vendor": "Intel"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.48.14",
- "kavlan": false,
- "mac": "d4:be:d9:f9:a3:4c",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "taurus-14-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "intel_idle",
- "cstate_governor": "menu",
- "ht_enabled": true,
- "pstate_driver": "intel_pstate",
- "pstate_governor": "performance",
- "turboboost_enabled": true
- },
- "performance": {
- "core_flops": 11770000000,
- "node_flops": 146900000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 15728640,
- "clock_speed": 2300000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Sandy Bridge",
- "microcode": "0x718",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
- "vendor": "Intel",
- "version": "E5-2630"
- },
- "sensors": {
- "power": {
- "available": true,
- "per_outlets": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 13,
- "uid": "wattmetre4"
- }
- ],
- "www": {
- "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
- }
- }
- }
- },
- "software": {
- "forced-deployment-timestamp": 202004301056,
- "postinstall-version": "1.2020043000",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x6d4ae520ab02d000260c92d9083fb4e2",
- "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
- "device": "sda",
- "firmware_version": 3.13,
- "interface": "SCSI",
- "model": "PERC H710",
- "size": 598879502336,
- "storage": "HDD",
- "vendor": "Dell (Raid)"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "taurus-14"
-}
\ No newline at end of file
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 df8e1d16efb9c2a122d960c6494b061d8e7b03b0..b864fcd4fe70372ddda6bfa0161f12cec85da86a 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
@@ -237,7 +237,7 @@
},
"storage_devices": [
{
- "by_id": "/dev/disk/by-id/wwn-0x6d4ae520ab2df600255d804e69aca7f7",
+ "by_id": "/dev/disk/by-id/wwn-0x6d4ae520ab2df600266a64ef0b08c365",
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
"device": "sda",
"firmware_version": 3.13,
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 6c3046f42340c0a0dba6c812ae49828491842446..7de4ff3412d4b6a971f1d9dbaf28210cb8e954ea 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -100,7 +100,7 @@ taurus-8:
version: E5-2630
storage_devices:
sda:
- by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2df600255d804e69aca7f7"
+ by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2df600266a64ef0b08c365"
by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
firmware_version: 3.13
model: PERC H710
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 474f62e7abf75a4b639ebfbb1237b5f245a6b934..a23cdb6259385c145451dee1aa9a9223c3424a5e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -7,6 +7,10 @@ queues:
- admin
nodes:
+ taurus-14:
+ status: retired
+ taurus-16:
+ status: retired
taurus-[1-16]:
processor:
microarchitecture: Sandy Bridge
@@ -71,4 +75,4 @@ nodes:
api:
metric: power
www:
- url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
+ url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_retired.yaml.erb b/input/grid5000/sites/lyon/clusters/taurus/taurus_retired.yaml.erb
deleted file mode 100644
index 7cc37796492ecdf277a631f1420c607172c93c97..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_retired.yaml.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-nodes:
- taurus-16:
- status: retired