diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
deleted file mode 100644
index 850cc0b1054fc5dd5c666d0b0ce49dd177d3a170..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 2,
- "nb_procs": 2,
- "nb_threads": 2,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "04/25/2006",
- "vendor": "Phoenix Technologies Ltd.",
- "version": "V1.35.2.2"
- },
- "bmc_version": "2.04",
- "chassis": {
- "manufacturer": "Sun Microsystems",
- "name": "Sun Fire V20z",
- "serial": "XG052536201"
- },
- "exotic": false,
- "kavlan": {
- "eth1": {
- "kavlan-1": "192.168.192.1",
- "kavlan-11": "10.7.200.1",
- "kavlan-12": "10.11.200.1",
- "kavlan-13": "10.15.200.1",
- "kavlan-14": "10.19.200.1",
- "kavlan-16": "10.27.200.1",
- "kavlan-18": "10.35.200.1",
- "kavlan-2": "192.168.208.1",
- "kavlan-20": "10.43.200.1",
- "kavlan-21": "10.47.200.1",
- "kavlan-3": "192.168.224.1",
- "kavlan-4": "10.12.0.1",
- "kavlan-5": "10.12.64.1",
- "kavlan-6": "10.12.128.1",
- "kavlan-7": "10.12.192.1",
- "kavlan-8": "10.13.0.1",
- "kavlan-9": "10.13.64.1"
- }
- },
- "kavlan6": {
- "eth1": {
- "kavlan-1": "2001:660:4406:480:2:0::1",
- "kavlan-11": "2001:660:4406:1a0:402:0::1",
- "kavlan-12": "2001:660:4406:2a0:402:0::1",
- "kavlan-13": "2001:660:4406:4a0:402:0::1",
- "kavlan-14": "2001:660:4406:5a0:402:0::1",
- "kavlan-16": "2001:660:4406:7a0:402:0::1",
- "kavlan-18": "2001:660:4406:8a0:402:0::1",
- "kavlan-2": "2001:660:4406:481:2:0::1",
- "kavlan-20": "2001:660:4406:3a0:402:0::1",
- "kavlan-21": "2001:660:4406:6a0:402:0::1",
- "kavlan-3": "2001:660:4406:482:2:0::1",
- "kavlan-4": "2001:660:4406:490:2:0::1",
- "kavlan-5": "2001:660:4406:491:2:0::1",
- "kavlan-6": "2001:660:4406:492:2:0::1",
- "kavlan-7": "2001:660:4406:493:2:0::1",
- "kavlan-8": "2001:660:4406:494:2:0::1",
- "kavlan-9": "2001:660:4406:495:2:0::1"
- }
- },
- "main_memory": {
- "ram_size": 2147483648
- },
- "monitoring": {
- "wattmeter": "true"
- },
- "network_adapters": [
- {
- "bridged": false,
- "device": "eth0",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:09:3d:12:9e:13",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "enp2s2f0",
- "vendor": "Broadcom"
- },
- {
- "bridged": true,
- "device": "eth1",
- "driver": "tg3",
- "enabled": true,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "ip": "172.16.49.1",
- "ip6": "2001:660:4406:400:2:0::1",
- "kavlan": true,
- "mac": "00:09:3d:12:9e:14",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "enp2s2f1",
- "network_address": "sagittaire-1.lyon.grid5000.fr",
- "rate": 1000000000,
- "switch": "salome",
- "switch_port": "GigabitEthernet21",
- "vendor": "Broadcom"
- },
- {
- "device": "bmc",
- "driver": "bnx2",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.49.1",
- "kavlan": false,
- "mac": "00:09:3d:12:9e:15",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "sagittaire-1-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "none",
- "cstate_governor": "menu",
- "ht_enabled": false,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "performance": {
- "core_flops": 4800000000,
- "node_flops": 9600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 65536,
- "cache_l1i": 65536,
- "cache_l2": 1048576,
- "cache_l3": 0,
- "clock_speed": 2400000000,
- "ht_capable": false,
- "instruction_set": "x86-64",
- "microarchitecture": "K8",
- "microcode": "0x3a",
- "model": "AMD Opteron",
- "other_description": "AMD Opteron(tm) Processor 250",
- "vendor": "AMD",
- "version": 250
- },
- "sensors": {
- "power": {
- "available": true,
- "per_outlets": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 0,
- "uid": "wattmetre1"
- }
- ],
- "www": {
- "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
- }
- }
- }
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2021012800",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
- "device": "sda",
- "firmware_version": 104,
- "interface": "SCSI",
- "model": "MAT3073NC",
- "size": 73543163904,
- "storage": "HDD",
- "vendor": "Fujitsu"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": false
- },
- "type": "node",
- "uid": "sagittaire-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 633f1a0f373cc06eabb21545c506455770d6b211..8abed95455314940a406d0078e6db16b4a0ff548 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -58,10 +58,6 @@
{
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "GigabitEthernet21",
- "uid": "sagittaire-1"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index c25a7a1ae914d603a43e0ae480aaca574a8df04a..0354db89b602de009d8f8c3265bea00abb636345 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -13,7 +13,6 @@
],
"model": "",
"ports": {
- "0": "sagittaire-1",
"1": "sagittaire-2",
"10": "sagittaire-14",
"11": "sagittaire-15",
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index b1e310f43dcf4f08d7399da09a52e8d5d3466ac1..d4c0316f39d1b10499c5d2f1f6d35a977dab5772 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -8,6 +8,8 @@ queues:
- admin
nodes:
+ sagittaire-1:
+ status: retired
sagittaire-[7-10]:
status: retired
sagittaire-[21-23]:
@@ -74,10 +76,6 @@ nodes:
rev: 104
size: 73543163904
- sagittaire-1:
- network_adapters:
- eth1:
- switch_port: '1:1'
sagittaire-11:
network_adapters:
eth1:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
index 18a7fdbc455f93800e9ec584974c994e28a76ada..9bddba594154525b829fdb53c25c331c3aa4696b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
@@ -1,9 +1,5 @@
---
nodes:
- sagittaire-1:
- pdu:
- - uid: wattmetre1
- port: 0
sagittaire-2:
pdu:
- uid: wattmetre1
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index e2bc58915dc4a8262971a3398db7ab5cb7cc21b8..03948ba1bae5c7dff06bbad2997f9aff1bff446b 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -36,7 +36,6 @@ salome:
uid: gw
kind: router
port: "0:24"
- 21: sagittaire-1
22: sagittaire-2
23: sagittaire-3
24: sagittaire-4