diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
deleted file mode 100644
index f4b958804b619d8ac113e1ce2cbeacd7a6f46e3f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
+++ /dev/null
@@ -1,320 +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.65.65.65",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge R720",
- "serial": "93MJD5J"
- },
- "exotic": false,
- "gpu_devices": {
- "nvidia0": {
- "compute_capability": "2.0",
- "cpu_affinity": 1,
- "device": "/dev/nvidia0",
- "memory": 5636096000,
- "model": "Tesla M2075",
- "power_default_limit": "225.00 W",
- "reservation": false,
- "vbios_version": "70.10.46.00.05",
- "vendor": "Nvidia"
- }
- },
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.194.2",
- "kavlan-11": "10.7.202.2",
- "kavlan-12": "10.11.202.2",
- "kavlan-13": "10.15.202.2",
- "kavlan-14": "10.19.202.2",
- "kavlan-16": "10.27.202.2",
- "kavlan-18": "10.35.202.2",
- "kavlan-2": "192.168.210.2",
- "kavlan-20": "10.43.202.2",
- "kavlan-21": "10.47.202.2",
- "kavlan-3": "192.168.226.2",
- "kavlan-4": "10.12.2.2",
- "kavlan-5": "10.12.66.2",
- "kavlan-6": "10.12.130.2",
- "kavlan-7": "10.12.194.2",
- "kavlan-8": "10.13.2.2",
- "kavlan-9": "10.13.66.2"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:480:3::2",
- "kavlan-11": "2001:660:4406:1a0:403::2",
- "kavlan-12": "2001:660:4406:2a0:403::2",
- "kavlan-13": "2001:660:4406:4a0:403::2",
- "kavlan-14": "2001:660:4406:5a0:403::2",
- "kavlan-16": "2001:660:4406:7a0:403::2",
- "kavlan-18": "2001:660:4406:8a0:403::2",
- "kavlan-2": "2001:660:4406:481:3::2",
- "kavlan-20": "2001:660:4406:3a0:403::2",
- "kavlan-21": "2001:660:4406:6a0:403::2",
- "kavlan-3": "2001:660:4406:482:3::2",
- "kavlan-4": "2001:660:4406:490:3::2",
- "kavlan-5": "2001:660:4406:491:3::2",
- "kavlan-6": "2001:660:4406:492:3::2",
- "kavlan-7": "2001:660:4406:493:3::2",
- "kavlan-8": "2001:660:4406:494:3::2",
- "kavlan-9": "2001:660:4406:495:3::2"
- }
- },
- "main_memory": {
- "ram_size": 34359738368
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "ipmitool": {
- "retries": 5
- }
- },
- "memory_devices": [
- {
- "device": "dimm_a1 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_a2 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_a3 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_a4 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_b1 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_b2 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_b3 ",
- "size": 4294967296,
- "technology": "dram"
- },
- {
- "device": "dimm_b4 ",
- "size": 4294967296,
- "technology": "dram"
- }
- ],
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "ixgbe",
- "enabled": true,
- "firmware_version": "0x8000095d, 19.5.12",
- "interface": "Ethernet",
- "ip": "172.16.50.2",
- "ip6": "2001:660:4406:400:3::2",
- "kavlan": true,
- "mac": "a0:36:9f:08:f6:b8",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": true,
- "mounted": true,
- "name": "enp68s0f0",
- "network_address": "orion-2.lyon.grid5000.fr",
- "rate": 10000000000,
- "sriov": true,
- "sriov_totalvfs": 63,
- "switch": "force10",
- "switch_port": "TenGigabitEthernet 0/18",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "ixgbe",
- "enabled": false,
- "firmware_version": "0x8000095d, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "a0:36:9f:08:f6:ba",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": false,
- "mounted": false,
- "name": "enp68s0f1",
- "sriov": true,
- "sriov_totalvfs": 63,
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:23:58",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno1",
- "sriov": true,
- "sriov_totalvfs": 7,
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth3",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:23:59",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "sriov": true,
- "sriov_totalvfs": 7,
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth4",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:23:5a",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno3",
- "sriov": true,
- "sriov_totalvfs": 7,
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth5",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.67, 0x80000faa, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "bc:30:5b:ef:23:5b",
- "management": false,
- "model": "I350 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno4",
- "sriov": true,
- "sriov_totalvfs": 7,
- "vendor": "Intel"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.50.2",
- "kavlan": false,
- "mac": "d4:be:d9:f9:a3:28",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "orion-2-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "intel_idle",
- "cstate_governor": "menu",
- "ht_enabled": true,
- "pstate_driver": "intel_cpufreq",
- "pstate_governor": "performance",
- "turboboost_enabled": true
- },
- "pdu": [
- {
- "port": 17,
- "uid": "wattmetre4"
- }
- ],
- "performance": {
- "core_flops": 18400000000,
- "node_flops": 220800000000
- },
- "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": "0x71a",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
- "vendor": "Intel",
- "version": "E5-2630"
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2022012700",
- "standard-environment": "debian11-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x6d4ae520ab2be900290030a00de8ced5",
- "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
- "firmware_version": 3.13,
- "id": "disk0",
- "interface": "RAID-0 (1 disk)",
- "model": "PERC H710",
- "size": 299439751168,
- "storage": "HDD",
- "vendor": "Dell"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "orion-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index 487efd40e74b8c9a382bd5795306d06bd7889758..3e1394fdffd8f4a3b4bd3c92d14438a50cc9f7d7 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -106,10 +106,6 @@
"uid": "orion-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 0/18",
- "uid": "orion-2"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre4.json b/data/grid5000/sites/lyon/pdus/wattmetre4.json
index d11d30939a40fccc8427f5e0765904b225ce8436..5234182a969193b0e79722a98afed257431b5dce 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre4.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre4.json
@@ -19,7 +19,6 @@
"12": "taurus-13",
"14": "taurus-15",
"16": "orion-1",
- "17": "orion-2",
"18": "orion-3",
"19": "orion-4",
"2": "taurus-3",
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
deleted file mode 100644
index 5ad5ddbd881e82cefed2660e1e2455f6ecd9325b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ /dev/null
@@ -1,147 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-orion-2:
- 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.65.65.65
- chassis:
- manufacturer: Dell Inc.
- name: PowerEdge R720
- serial: 93MJD5J
- main_memory:
- ram_size: 34359738368
- memory_devices:
- 'dimm_a1 ':
- size: 4294967296
- technology: dram
- 'dimm_a2 ':
- size: 4294967296
- technology: dram
- 'dimm_a3 ':
- size: 4294967296
- technology: dram
- 'dimm_a4 ':
- size: 4294967296
- technology: dram
- 'dimm_b1 ':
- size: 4294967296
- technology: dram
- 'dimm_b2 ':
- size: 4294967296
- technology: dram
- 'dimm_b3 ':
- size: 4294967296
- technology: dram
- 'dimm_b4 ':
- size: 4294967296
- technology: dram
- network_adapters:
- bmc:
- ip: 172.17.50.2
- mac: d4:be:d9:f9:a3:28
- management: true
- eth0:
- driver: ixgbe
- firmware_version: 0x8000095d, 19.5.12
- interface: Ethernet
- ip: 172.16.50.2
- mac: a0:36:9f:08:f6:b8
- management: false
- model: Ethernet 10G 2P X520 Adapter
- name: enp68s0f0
- rate: 10000000000
- sriov: true
- sriov_totalvfs: 63
- vendor: Intel
- eth1:
- driver: ixgbe
- firmware_version: 0x8000095d, 19.5.12
- interface: Ethernet
- mac: a0:36:9f:08:f6:ba
- management: false
- model: Ethernet 10G 2P X520 Adapter
- name: enp68s0f1
- sriov: true
- sriov_totalvfs: 63
- vendor: Intel
- eth2:
- driver: igb
- firmware_version: 1.67, 0x80000faa, 19.5.12
- interface: Ethernet
- mac: bc:30:5b:ef:23:58
- management: false
- model: I350 Gigabit Network Connection
- name: eno1
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- eth3:
- driver: igb
- firmware_version: 1.67, 0x80000faa, 19.5.12
- interface: Ethernet
- mac: bc:30:5b:ef:23:59
- management: false
- model: I350 Gigabit Network Connection
- name: eno2
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- eth4:
- driver: igb
- firmware_version: 1.67, 0x80000faa, 19.5.12
- interface: Ethernet
- mac: bc:30:5b:ef:23:5a
- management: false
- model: I350 Gigabit Network Connection
- name: eno3
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- eth5:
- driver: igb
- firmware_version: 1.67, 0x80000faa, 19.5.12
- interface: Ethernet
- mac: bc:30:5b:ef:23:5b
- management: false
- model: I350 Gigabit Network Connection
- name: eno4
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- operating_system:
- cstate_driver: intel_idle
- cstate_governor: menu
- ht_enabled: true
- pstate_driver: intel_cpufreq
- pstate_governor: performance
- turboboost_enabled: true
- processor:
- cache_l1d: 32768
- cache_l1i: 32768
- cache_l2: 262144
- cache_l3: 15728640
- ht_capable: true
- instruction_set: x86-64
- microcode: '0x71a'
- model: Intel Xeon
- other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
- vendor: Intel
- version: E5-2630
- storage_devices:
- pci-0000:02:00.0-scsi-0:2:0:0:
- by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2be900290030a00de8ced5"
- by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
- firmware_version: 3.13
- model: PERC H710
- size: 299439751168
- storage: HDD
- supported_job_types:
- virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index 568890b68cf880abe8179ec9ffd182ac82ada4b3..0ef591818cd385086d3b7b77bc9ec7ff4d45d5dd 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -78,6 +78,7 @@ nodes:
eth0:
switch_port: TenGigabitEthernet 0/18
orion-2:
+ status: retired
network_adapters:
eth0:
switch_port: TenGigabitEthernet 0/19
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index a73ee534be4fa5792d58677f20edacda9ec59fee..af1845da0c3d694ca469a2b126f1825284bc68aa 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -83,7 +83,6 @@ force10:
13: taurus-13
15: taurus-15
17: orion-1
- 18: orion-2
19: orion-3
20: orion-4
21: