diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json deleted file mode 100644 index a79038e1a5..0000000000 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "architecture": { - "cpu_core_numbering": "round-robin", - "nb_cores": 12, - "nb_procs": 2, - "nb_threads": 24, - "platform_type": "x86_64" - }, - "bios": { - "release_date": "01/08/2020", - "vendor": "Dell Inc.", - "version": "2.9.0" - }, - "bmc_version": "2.63.60.62", - "chassis": { - "manufacturer": "Dell Inc.", - "name": "PowerEdge M620", - "serial": "6MVTG5J" - }, - "exotic": false, - "kavlan": { - "eth0": { - "kavlan-1": "192.168.194.6", - "kavlan-11": "10.7.238.6", - "kavlan-12": "10.11.238.6", - "kavlan-13": "10.15.238.6", - "kavlan-14": "10.19.238.6", - "kavlan-16": "10.27.238.6", - "kavlan-18": "10.35.238.6", - "kavlan-2": "192.168.210.6", - "kavlan-20": "10.43.238.6", - "kavlan-21": "10.47.238.6", - "kavlan-3": "192.168.226.6", - "kavlan-4": "10.40.2.6", - "kavlan-5": "10.40.66.6", - "kavlan-6": "10.40.130.6", - "kavlan-7": "10.40.194.6", - "kavlan-8": "10.41.2.6", - "kavlan-9": "10.41.66.6" - }, - "eth1": { - "kavlan-1": "192.168.195.6", - "kavlan-11": "10.7.238.106", - "kavlan-12": "10.11.238.106", - "kavlan-13": "10.15.238.106", - "kavlan-14": "10.19.238.106", - "kavlan-16": "10.27.238.106", - "kavlan-18": "10.35.238.106", - "kavlan-2": "192.168.211.6", - "kavlan-20": "10.43.238.106", - "kavlan-21": "10.47.238.106", - "kavlan-3": "192.168.227.6", - "kavlan-4": "10.40.3.6", - "kavlan-5": "10.40.67.6", - "kavlan-6": "10.40.131.6", - "kavlan-7": "10.40.195.6", - "kavlan-8": "10.41.3.6", - "kavlan-9": "10.41.67.6" - } - }, - "kavlan6": { - "eth0": { - "kavlan-1": "2001:660:4406:380:2::6", - "kavlan-11": "2001:660:4406:1a0:302::6", - "kavlan-12": "2001:660:4406:2a0:302::6", - "kavlan-13": "2001:660:4406:4a0:302::6", - "kavlan-14": "2001:660:4406:5a0:302::6", - "kavlan-16": "2001:660:4406:7a0:302::6", - "kavlan-18": "2001:660:4406:8a0:302::6", - "kavlan-2": "2001:660:4406:381:2::6", - "kavlan-20": "2001:660:4406:3a0:302::6", - "kavlan-21": "2001:660:4406:6a0:302::6", - "kavlan-3": "2001:660:4406:382:2::6", - "kavlan-4": "2001:660:4406:390:2::6", - "kavlan-5": "2001:660:4406:391:2::6", - "kavlan-6": "2001:660:4406:392:2::6", - "kavlan-7": "2001:660:4406:393:2::6", - "kavlan-8": "2001:660:4406:394:2::6", - "kavlan-9": "2001:660:4406:395:2::6" - }, - "eth1": { - "kavlan-1": "2001:660:4406:380:2:1:0:6", - "kavlan-11": "2001:660:4406:1a0:302:1:0:6", - "kavlan-12": "2001:660:4406:2a0:302:1:0:6", - "kavlan-13": "2001:660:4406:4a0:302:1:0:6", - "kavlan-14": "2001:660:4406:5a0:302:1:0:6", - "kavlan-16": "2001:660:4406:7a0:302:1:0:6", - "kavlan-18": "2001:660:4406:8a0:302:1:0:6", - "kavlan-2": "2001:660:4406:381:2:1:0:6", - "kavlan-20": "2001:660:4406:3a0:302:1:0:6", - "kavlan-21": "2001:660:4406:6a0:302:1:0:6", - "kavlan-3": "2001:660:4406:382:2:1:0:6", - "kavlan-4": "2001:660:4406:390:2:1:0:6", - "kavlan-5": "2001:660:4406:391:2:1:0:6", - "kavlan-6": "2001:660:4406:392:2:1:0:6", - "kavlan-7": "2001:660:4406:393:2:1:0:6", - "kavlan-8": "2001:660:4406:394:2:1:0:6", - "kavlan-9": "2001:660:4406:395:2:1:0:6" - } - }, - "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": "bnx2x", - "enabled": true, - "firmware_version": "FFV14.07.06 bc 7.14.11", - "interface": "Ethernet", - "ip": "172.16.177.6", - "ip6": "2001:660:4406:300:2::6", - "kavlan": true, - "mac": "e0:db:55:09:7b:70", - "management": false, - "model": "NetXtreme II BCM57810 10 Gigabit Ethernet", - "mountable": true, - "mounted": true, - "name": "eno1", - "network_address": "petitprince-6.luxembourg.grid5000.fr", - "rate": 10000000000, - "sriov": false, - "sriov_totalvfs": 0, - "switch": "mxl1", - "switch_port": "TenGigabitEthernet 0/6", - "vendor": "Broadcom Inc. and subsidiaries" - }, - { - "bridged": false, - "device": "eth1", - "driver": "bnx2x", - "enabled": true, - "firmware_version": "FFV14.07.06 bc 7.14.11", - "interface": "Ethernet", - "ip": "172.16.177.106", - "ip6": "2001:660:4406:300:2:1:0:6", - "kavlan": true, - "mac": "e0:db:55:09:7b:72", - "management": false, - "model": "NetXtreme II BCM57810 10 Gigabit Ethernet", - "mountable": true, - "mounted": false, - "name": "eno2", - "network_address": "petitprince-6-eth1.luxembourg.grid5000.fr", - "rate": 10000000000, - "sriov": false, - "sriov_totalvfs": 0, - "switch": "mxl2", - "switch_port": "TenGigabitEthernet 0/6", - "vendor": "Broadcom Inc. and subsidiaries" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.177.6", - "kavlan": false, - "mac": "5c:f9:dd:d7:27:6b", - "management": true, - "mountable": false, - "mounted": false, - "network_address": "petitprince-6-bmc.luxembourg.grid5000.fr", - "rate": 1000000000, - "switch": "gw-luxembourg", - "switch_port": "Gi2/36" - } - ], - "operating_system": { - "cstate_driver": "intel_idle", - "cstate_governor": "menu", - "ht_enabled": true, - "pstate_driver": "intel_cpufreq", - "pstate_governor": "performance", - "turboboost_enabled": true - }, - "performance": { - "core_flops": 16000000000, - "node_flops": 192000000000 - }, - "processor": { - "cache_l1": null, - "cache_l1d": 32768, - "cache_l1i": 32768, - "cache_l2": 262144, - "cache_l3": 15728640, - "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-2630L 0 @ 2.00GHz", - "vendor": "Intel", - "version": "E5-2630L" - }, - "software": { - "forced-deployment-timestamp": 202007300948, - "postinstall-version": "1.2023011210", - "standard-environment": "debian11-x64-std" - }, - "storage_devices": [ - { - "by_id": "/dev/disk/by-id/wwn-0x5000c5004008cea0", - "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1", - "firmware_version": "AA08", - "id": "disk0", - "interface": "SATA", - "model": "ST9250610NS", - "size": 250059350016, - "storage": "HDD", - "vendor": "Seagate" - } - ], - "supported_job_types": { - "besteffort": true, - "deploy": true, - "max_walltime": 0, - "queues": [ - "default", - "admin" - ], - "virtual": "ivt" - }, - "type": "node", - "uid": "petitprince-6" -} \ No newline at end of file diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json index 8715ba635b..a3e8846ed6 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json +++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json @@ -51,10 +51,6 @@ "uid": "petitprince-5" }, { - "kind": "node", - "port": "eth0", - "snmp_name": "TenGigabitEthernet 0/6", - "uid": "petitprince-6" }, { "kind": "node", diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json index a43747913e..2b32ca8f74 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json +++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json @@ -51,10 +51,6 @@ "uid": "petitprince-5" }, { - "kind": "node", - "port": "eth1", - "snmp_name": "TenGigabitEthernet 0/6", - "uid": "petitprince-6" }, { "kind": "node", diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml deleted file mode 100644 index 4400a227c1..0000000000 --- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml +++ /dev/null @@ -1,104 +0,0 @@ -# Generated by g5k-checks (g5k-checks -m api) ---- -petitprince-6: - architecture: - cpu_core_numbering: round-robin - nb_cores: 12 - nb_procs: 2 - nb_threads: 24 - platform_type: x86_64 - bios: - release_date: 01/08/2020 - vendor: Dell Inc. - version: 2.9.0 - bmc_version: 2.63.60.62 - chassis: - manufacturer: Dell Inc. - name: PowerEdge M620 - serial: 6MVTG5J - 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.177.6 - mac: 5c:f9:dd:d7:27:6b - management: true - eth0: - driver: bnx2x - firmware_version: FFV14.07.06 bc 7.14.11 - interface: Ethernet - ip: 172.16.177.6 - mac: e0:db:55:09:7b:70 - management: false - model: NetXtreme II BCM57810 10 Gigabit Ethernet - name: eno1 - rate: 10000000000 - sriov: false - sriov_totalvfs: 0 - vendor: Broadcom Inc. and subsidiaries - eth1: - driver: bnx2x - firmware_version: FFV14.07.06 bc 7.14.11 - interface: Ethernet - mac: e0:db:55:09:7b:72 - management: false - model: NetXtreme II BCM57810 10 Gigabit Ethernet - name: eno2 - rate: 10000000000 - sriov: false - sriov_totalvfs: 0 - vendor: Broadcom Inc. and subsidiaries - 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-2630L 0 @ 2.00GHz - vendor: Intel - version: E5-2630L - storage_devices: - pci-0000:00:1f.2-ata-1: - by_id: "/dev/disk/by-id/wwn-0x5000c5004008cea0" - by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1" - firmware_version: AA08 - model: ST9250610NS - size: 250059350016 - storage: HDD - supported_job_types: - virtual: ivt diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml index 5e66d53cc0..d67aa535a2 100644 --- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml +++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml @@ -40,14 +40,6 @@ nodes: switch_port: Te0/5 bmc: switch_port: Gi2/36 - petitprince-6: - network_adapters: - eth0: - switch_port: Te0/6 - eth1: - switch_port: Te0/6 - bmc: - switch_port: Gi2/36 petitprince-7: network_adapters: eth0: diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_retired.yaml.erb b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_retired.yaml.erb index 31f99cd676..05958b289a 100644 --- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_retired.yaml.erb +++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_retired.yaml.erb @@ -1,5 +1,5 @@ nodes: -<% [8, 12].each { |i| %> +<% [6, 8, 12].each { |i| %> petitprince-<%= i %>: status: retired <% } %> diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml index e42463c1e1..c6342f093e 100644 --- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml +++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml @@ -75,8 +75,6 @@ mxl1: uid: petitprince-4 5: uid: petitprince-5 - 6: - uid: petitprince-6 7: uid: petitprince-7 9: diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml index 5d33edf0bf..5eba11714c 100644 --- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml +++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml @@ -75,8 +75,6 @@ mxl2: uid: petitprince-4-eth1 5: uid: petitprince-5-eth1 - 6: - uid: petitprince-6-eth1 7: uid: petitprince-7-eth1 9: