diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
deleted file mode 100644
index 3ab5c6e5fd05dc809025f4ef35ae35b6e69925bd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 8,
- "nb_procs": 2,
- "nb_threads": 8,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "10/30/2010",
- "vendor": "Dell Inc.",
- "version": "2.7.0"
- },
- "bmc_version": "1.77",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge 1950",
- "serial": "3R2593J"
- },
- "exotic": false,
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.192.3",
- "kavlan-11": "10.7.237.3",
- "kavlan-12": "10.11.237.3",
- "kavlan-13": "10.15.237.3",
- "kavlan-14": "10.19.237.3",
- "kavlan-16": "10.27.237.3",
- "kavlan-18": "10.35.237.3",
- "kavlan-2": "192.168.208.3",
- "kavlan-20": "10.43.237.3",
- "kavlan-21": "10.47.237.3",
- "kavlan-3": "192.168.224.3",
- "kavlan-4": "10.40.0.3",
- "kavlan-5": "10.40.64.3",
- "kavlan-6": "10.40.128.3",
- "kavlan-7": "10.40.192.3",
- "kavlan-8": "10.41.0.3",
- "kavlan-9": "10.41.64.3"
- },
- "eth1": {
- "kavlan-1": "192.168.193.3",
- "kavlan-11": "10.7.237.103",
- "kavlan-12": "10.11.237.103",
- "kavlan-13": "10.15.237.103",
- "kavlan-14": "10.19.237.103",
- "kavlan-16": "10.27.237.103",
- "kavlan-18": "10.35.237.103",
- "kavlan-2": "192.168.209.3",
- "kavlan-20": "10.43.237.103",
- "kavlan-21": "10.47.237.103",
- "kavlan-3": "192.168.225.3",
- "kavlan-4": "10.40.1.3",
- "kavlan-5": "10.40.65.3",
- "kavlan-6": "10.40.129.3",
- "kavlan-7": "10.40.193.3",
- "kavlan-8": "10.41.1.3",
- "kavlan-9": "10.41.65.3"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:381:1::3",
- "kavlan-11": "2001:660:4406:38b:1::3",
- "kavlan-12": "2001:660:4406:38c:1::3",
- "kavlan-13": "2001:660:4406:38d:1::3",
- "kavlan-14": "2001:660:4406:38e:1::3",
- "kavlan-16": "2001:660:4406:390:1::3",
- "kavlan-18": "2001:660:4406:392:1::3",
- "kavlan-2": "2001:660:4406:382:1::3",
- "kavlan-20": "2001:660:4406:394:1::3",
- "kavlan-21": "2001:660:4406:395:1::3",
- "kavlan-3": "2001:660:4406:383:1::3",
- "kavlan-4": "2001:660:4406:384:1::3",
- "kavlan-5": "2001:660:4406:385:1::3",
- "kavlan-6": "2001:660:4406:386:1::3",
- "kavlan-7": "2001:660:4406:387:1::3",
- "kavlan-8": "2001:660:4406:388:1::3",
- "kavlan-9": "2001:660:4406:389:1::3"
- },
- "eth1": {
- "kavlan-1": "2001:660:4406:381:1:1::3",
- "kavlan-11": "2001:660:4406:38b:1:1::3",
- "kavlan-12": "2001:660:4406:38c:1:1::3",
- "kavlan-13": "2001:660:4406:38d:1:1::3",
- "kavlan-14": "2001:660:4406:38e:1:1::3",
- "kavlan-16": "2001:660:4406:390:1:1::3",
- "kavlan-18": "2001:660:4406:392:1:1::3",
- "kavlan-2": "2001:660:4406:382:1:1::3",
- "kavlan-20": "2001:660:4406:394:1:1::3",
- "kavlan-21": "2001:660:4406:395:1:1::3",
- "kavlan-3": "2001:660:4406:383:1:1::3",
- "kavlan-4": "2001:660:4406:384:1:1::3",
- "kavlan-5": "2001:660:4406:385:1:1::3",
- "kavlan-6": "2001:660:4406:386:1:1::3",
- "kavlan-7": "2001:660:4406:387:1:1::3",
- "kavlan-8": "2001:660:4406:388:1:1::3",
- "kavlan-9": "2001:660:4406:389:1:1::3"
- }
- },
- "main_memory": {
- "ram_size": 17179869184
- },
- "monitoring": {
- "wattmeter": "false"
- },
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "bnx2",
- "enabled": true,
- "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
- "interface": "Ethernet",
- "ip": "172.16.176.3",
- "ip6": "2001:660:4406:300:1::3",
- "kavlan": true,
- "mac": "00:19:b9:f2:0e:83",
- "management": false,
- "model": "NetXtreme II BCM5708 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "eno1",
- "network_address": "granduc-3.luxembourg.grid5000.fr",
- "rate": 1000000000,
- "switch": "gw",
- "switch_port": "GigabitEthernet2/3",
- "vendor": "Broadcom"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "bnx2",
- "enabled": true,
- "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
- "interface": "Ethernet",
- "ip": "172.16.176.103",
- "ip6": "2001:660:4406:300:1:1::3",
- "kavlan": true,
- "mac": "00:19:b9:f2:0e:85",
- "management": false,
- "model": "NetXtreme II BCM5708 Gigabit Ethernet",
- "mountable": true,
- "mounted": false,
- "name": "eno2",
- "network_address": "granduc-3-eth1.luxembourg.grid5000.fr",
- "rate": 1000000000,
- "switch": "gw",
- "switch_port": "GigabitEthernet1/26",
- "vendor": "Broadcom"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "ixgbe",
- "enabled": true,
- "firmware_version": "0xc7390000",
- "interface": "Ethernet",
- "ip": "172.16.176.203",
- "ip6": "2001:660:4406:300:1:2::3",
- "kavlan": false,
- "mac": "00:1b:21:3c:87:cb",
- "management": false,
- "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
- "mountable": true,
- "mounted": false,
- "name": "enp13s0f0",
- "network_address": "granduc-3-eth2.luxembourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "ul-grid5000-sw02",
- "switch_port": "Ethernet1/4",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth3",
- "driver": "ixgbe",
- "enabled": false,
- "firmware_version": "0xc7390000",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:1b:21:3c:87:ca",
- "management": false,
- "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "enp13s0f1",
- "vendor": "Intel"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.176.3",
- "kavlan": false,
- "mac": "00:1c:23:d6:c3:0a",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "granduc-3-bmc.luxembourg.grid5000.fr",
- "switch": "gw-luxembourg"
- }
- ],
- "operating_system": {
- "cstate_driver": "none",
- "cstate_governor": "menu",
- "ht_enabled": false,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "performance": {
- "core_flops": 6409000000.0,
- "node_flops": 44070000000.0
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 4194304,
- "cache_l3": 0,
- "clock_speed": 2000000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Clovertown",
- "microcode": "0xbc",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU L5335 @ 2.00GHz",
- "vendor": "Intel",
- "version": "L5335"
- },
- "sensors": {
- },
- "software": {
- "forced-deployment-timestamp": 202004301056,
- "postinstall-version": "1.2020061100",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec50793",
- "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
- "device": "sda",
- "firmware_version": "S22A",
- "interface": "SAS",
- "model": "ST9146802SS",
- "size": 146815733760,
- "storage": "HDD",
- "vendor": "Seagate"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "granduc-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
deleted file mode 100644
index 187bf20e2be3ef58607cf20ad2db036d81905d2b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 16,
- "nb_procs": 2,
- "nb_threads": 32,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "7/08/2019",
- "vendor": "Dell Inc.",
- "version": "2.5.7"
- },
- "bmc_version": "2.53",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge C6220",
- "serial": "G1MGWX1"
- },
- "exotic": false,
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.194.48",
- "kavlan-11": "10.7.215.48",
- "kavlan-12": "10.11.215.48",
- "kavlan-13": "10.15.215.48",
- "kavlan-14": "10.19.215.48",
- "kavlan-16": "10.27.215.48",
- "kavlan-18": "10.35.215.48",
- "kavlan-2": "192.168.210.48",
- "kavlan-20": "10.43.215.48",
- "kavlan-21": "10.47.215.48",
- "kavlan-3": "192.168.226.48",
- "kavlan-4": "10.16.2.48",
- "kavlan-5": "10.16.66.48",
- "kavlan-6": "10.16.130.48",
- "kavlan-7": "10.16.194.48",
- "kavlan-8": "10.17.2.48",
- "kavlan-9": "10.17.66.48"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:581:c::30",
- "kavlan-11": "2001:660:4406:58b:c::30",
- "kavlan-12": "2001:660:4406:58c:c::30",
- "kavlan-13": "2001:660:4406:58d:c::30",
- "kavlan-14": "2001:660:4406:58e:c::30",
- "kavlan-16": "2001:660:4406:590:c::30",
- "kavlan-18": "2001:660:4406:592:c::30",
- "kavlan-2": "2001:660:4406:582:c::30",
- "kavlan-20": "2001:660:4406:594:c::30",
- "kavlan-21": "2001:660:4406:595:c::30",
- "kavlan-3": "2001:660:4406:583:c::30",
- "kavlan-4": "2001:660:4406:584:c::30",
- "kavlan-5": "2001:660:4406:585:c::30",
- "kavlan-6": "2001:660:4406:586:c::30",
- "kavlan-7": "2001:660:4406:587:c::30",
- "kavlan-8": "2001:660:4406:588:c::30",
- "kavlan-9": "2001:660:4406:589:c::30"
- }
- },
- "main_memory": {
- "ram_size": 68719476736
- },
- "monitoring": {
- "wattmeter": "shared"
- },
- "network_adapters": [
- {
- "device": "eth0",
- "driver": "igb",
- "enabled": true,
- "firmware_version": "1.57.0",
- "interface": "Ethernet",
- "ip": "172.16.75.48",
- "ip6": "2001:660:4406:500:c::30",
- "kavlan": true,
- "mac": "78:45:c4:fc:3a:43",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": true,
- "mounted": true,
- "name": "eno1",
- "network_address": "grcinq-48.nancy.grid5000.fr",
- "rate": 1000000000,
- "switch": "sgrcinq",
- "switch_port": "GigabitEthernet1/0/24",
- "vendor": "Intel"
- },
- {
- "device": "eth1",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.57.0",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "78:45:c4:fc:3a:44",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "vendor": "Intel"
- },
- {
- "device": "ib0",
- "driver": "mlx4_core",
- "enabled": true,
- "firmware_version": "2.42.5000",
- "guid": "0x0002c903001df221",
- "interface": "InfiniBand",
- "ip": "172.18.75.48",
- "kavlan": false,
- "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:1d:f2:21",
- "management": false,
- "model": "MT27500 Family [ConnectX-3]",
- "mountable": true,
- "mounted": true,
- "name": "ib0",
- "netmask": "255.255.255.0",
- "network_address": "grcinq-48-ib0.nancy.grid5000.fr",
- "rate": 56000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.75.48",
- "kavlan": false,
- "mac": "78:45:c4:fc:3a:45",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "grcinq-48-bmc.nancy.grid5000.fr"
- }
- ],
- "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": 11960000000,
- "node_flops": 201600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 20971520,
- "clock_speed": 2000000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Sandy Bridge",
- "microcode": "0x71a",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
- "vendor": "Intel",
- "version": "E5-2650"
- },
- "sensors": {
- "power": {
- "available": true,
- "per_outlets": false,
- "via": {
- "api": {
- "metric": "power"
- }
- }
- }
- },
- "software": {
- "forced-deployment-timestamp": 202004301056,
- "postinstall-version": "1.2020061100",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x5000c50090f7b98a",
- "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
- "device": "sda",
- "firmware_version": "GA0F",
- "interface": "SATA",
- "model": "ST1000NM0033-9ZM",
- "size": 1000204886016,
- "storage": "HDD",
- "vendor": "Seagate"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 604800,
- "queues": [
- "admin",
- "production"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "grcinq-48"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
index 356f3f98cf60d4b9d0a673f4fd2836f9415d55ae..4665cae20d9b883944f968a9104d03180d9f2a30 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
@@ -1,5 +1,5 @@
nodes:
-<% [ 1, 5, 7, 8, 10, 11, 13, 14, 17, 19, 22 ].each { |i| %>
+<% [ 1, 3, 5, 7, 8, 10, 11, 13, 14, 17, 19, 22 ].each { |i| %>
granduc-<%= i %>:
status: retired
<% } %>
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
index 7c8807d0e7b2f4492d0d6a72b8472023d8b0ea92..1c83a998ab7e6c1b44ac68b56b59b866cfef0746 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
@@ -6,6 +6,8 @@ queues:
- admin
- production
nodes:
+ grcinq-48:
+ status: retired
grcinq-[1-48]:
processor:
microarchitecture: Sandy Bridge