From a4c297f87218821d1aa7c0f972dc7c8bb67f702e Mon Sep 17 00:00:00 2001
From: JACQUOT Pierre <pierre.jacquot@inria.fr>
Date: Thu, 10 Mar 2022 15:48:01 +0100
Subject: [PATCH] [nova] nova-20 is retired.
---
.../lyon/clusters/nova/nodes/nova-20.json | 287 ------------------
.../lyon/network_equipments/force10.json | 4 -
data/grid5000/sites/lyon/pdus/wattmetre1.json | 1 -
.../lyon/clusters/nova/nodes/nova-20.yaml | 135 --------
.../sites/lyon/clusters/nova/nova.yaml | 3 +
.../grid5000/sites/lyon/networks/force10.yaml | 2 +-
input/grid5000/sites/lyon/pdus.yaml | 1 -
7 files changed, 4 insertions(+), 429 deletions(-)
delete mode 100644 data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
delete mode 100644 input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
deleted file mode 100644
index 967ca1ca4ac..00000000000
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 16,
- "nb_procs": 2,
- "nb_threads": 32,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "06/07/2021",
- "vendor": "Dell Inc.",
- "version": "2.13.0"
- },
- "bmc_version": "2.82.82.82",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge R430",
- "serial": "97VCRG2"
- },
- "exotic": false,
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.196.20",
- "kavlan-11": "10.7.204.20",
- "kavlan-12": "10.11.204.20",
- "kavlan-13": "10.15.204.20",
- "kavlan-14": "10.19.204.20",
- "kavlan-16": "10.27.204.20",
- "kavlan-18": "10.35.204.20",
- "kavlan-2": "192.168.212.20",
- "kavlan-20": "10.43.204.20",
- "kavlan-21": "10.47.204.20",
- "kavlan-3": "192.168.228.20",
- "kavlan-4": "10.12.4.20",
- "kavlan-5": "10.12.68.20",
- "kavlan-6": "10.12.132.20",
- "kavlan-7": "10.12.196.20",
- "kavlan-8": "10.13.4.20",
- "kavlan-9": "10.13.68.20"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:480:5::14",
- "kavlan-11": "2001:660:4406:1a0:405::14",
- "kavlan-12": "2001:660:4406:2a0:405::14",
- "kavlan-13": "2001:660:4406:4a0:405::14",
- "kavlan-14": "2001:660:4406:5a0:405::14",
- "kavlan-16": "2001:660:4406:7a0:405::14",
- "kavlan-18": "2001:660:4406:8a0:405::14",
- "kavlan-2": "2001:660:4406:481:5::14",
- "kavlan-20": "2001:660:4406:3a0:405::14",
- "kavlan-21": "2001:660:4406:6a0:405::14",
- "kavlan-3": "2001:660:4406:482:5::14",
- "kavlan-4": "2001:660:4406:490:5::14",
- "kavlan-5": "2001:660:4406:491:5::14",
- "kavlan-6": "2001:660:4406:492:5::14",
- "kavlan-7": "2001:660:4406:493:5::14",
- "kavlan-8": "2001:660:4406:494:5::14",
- "kavlan-9": "2001:660:4406:495:5::14"
- }
- },
- "main_memory": {
- "ram_size": 68719476736
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "ipmitool": {
- "retries": 5
- }
- },
- "memory_devices": [
- {
- "device": "dimm_a1",
- "size": 17179869184,
- "technology": "dram"
- },
- {
- "device": "dimm_a2",
- "size": 17179869184,
- "technology": "dram"
- },
- {
- "device": "dimm_b1",
- "size": 17179869184,
- "technology": "dram"
- },
- {
- "device": "dimm_b2",
- "size": 17179869184,
- "technology": "dram"
- }
- ],
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "ixgbe",
- "enabled": true,
- "firmware_version": "0x8000095d, 19.5.12",
- "interface": "Ethernet",
- "ip": "172.16.52.20",
- "ip6": "2001:660:4406:400:5::14",
- "kavlan": true,
- "mac": "a0:36:9f:d2:c6:4c",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": true,
- "mounted": true,
- "name": "enp5s0f0",
- "network_address": "nova-20.lyon.grid5000.fr",
- "rate": 10000000000,
- "sriov": true,
- "sriov_totalvfs": 63,
- "switch": "force10",
- "switch_port": "TenGigabitEthernet 0/44",
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "ixgbe",
- "enabled": false,
- "firmware_version": "0x8000095d, 19.5.12",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "a0:36:9f:d2:c6:4e",
- "management": false,
- "model": "Ethernet 10G 2P X520 Adapter",
- "mountable": false,
- "mounted": false,
- "name": "enp5s0f1",
- "sriov": true,
- "sriov_totalvfs": 63,
- "vendor": "Intel"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "FFV21.81.3 bc 5720-v1.39",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:66:da:7e:ed:ad",
- "management": false,
- "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
- "mountable": false,
- "mounted": false,
- "name": "eno1",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "bridged": false,
- "device": "eth3",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "FFV21.81.3 bc 5720-v1.39",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:66:da:7e:ed:ae",
- "management": false,
- "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "bridged": false,
- "device": "eth4",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "FFV21.81.3 bc 5720-v1.39",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:66:da:7e:ed:af",
- "management": false,
- "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
- "mountable": false,
- "mounted": false,
- "name": "eno3",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "bridged": false,
- "device": "eth5",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "FFV21.81.3 bc 5720-v1.39",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:66:da:7e:ed:b0",
- "management": false,
- "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
- "mountable": false,
- "mounted": false,
- "name": "eno4",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.52.20",
- "kavlan": false,
- "mac": "18:66:da:7e:ed:b1",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "nova-20-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": 26,
- "uid": "wattmetre1"
- }
- ],
- "performance": {
- "core_flops": 33600000000,
- "node_flops": 537600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 20971520,
- "clock_speed": 2100000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Broadwell",
- "microcode": "0xb00003e",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz",
- "vendor": "Intel",
- "version": "E5-2620 v4"
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2022030910",
- "standard-environment": "debian11-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x6847beb0d74b9f00234f777e59eced29",
- "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
- "firmware_version": 4.3,
- "id": "disk0",
- "interface": "RAID-0 (2 disks)",
- "model": "PERC H330 Mini",
- "size": 598879502336,
- "storage": "HDD",
- "vendor": "Dell"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "nova-20"
-}
\ 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 3e1394fdffd..785c4b80826 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -258,10 +258,6 @@
"uid": "nova-19"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "TenGigabitEthernet 0/44",
- "uid": "nova-20"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index 702ae9d269f..a23c2cd2920 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -32,7 +32,6 @@
"23": "nova-17",
"24": "nova-18",
"25": "nova-19",
- "26": "nova-20",
"27": "nova-21",
"28": "nova-22",
"29": "nova-23",
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
deleted file mode 100644
index c27a02026e7..00000000000
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-nova-20:
- architecture:
- cpu_core_numbering: round-robin
- nb_cores: 16
- nb_procs: 2
- nb_threads: 32
- platform_type: x86_64
- bios:
- release_date: 06/07/2021
- vendor: Dell Inc.
- version: 2.13.0
- bmc_version: 2.82.82.82
- chassis:
- manufacturer: Dell Inc.
- name: PowerEdge R430
- serial: 97VCRG2
- main_memory:
- ram_size: 68719476736
- memory_devices:
- dimm_a1:
- size: 17179869184
- technology: dram
- dimm_a2:
- size: 17179869184
- technology: dram
- dimm_b1:
- size: 17179869184
- technology: dram
- dimm_b2:
- size: 17179869184
- technology: dram
- network_adapters:
- bmc:
- ip: 172.17.52.20
- mac: 18:66:da:7e:ed:b1
- management: true
- eth0:
- driver: ixgbe
- firmware_version: 0x8000095d, 19.5.12
- interface: Ethernet
- ip: 172.16.52.20
- mac: a0:36:9f:d2:c6:4c
- management: false
- model: Ethernet 10G 2P X520 Adapter
- name: enp5s0f0
- rate: 10000000000
- sriov: true
- sriov_totalvfs: 63
- vendor: Intel
- eth1:
- driver: ixgbe
- firmware_version: 0x8000095d, 19.5.12
- interface: Ethernet
- mac: a0:36:9f:d2:c6:4e
- management: false
- model: Ethernet 10G 2P X520 Adapter
- name: enp5s0f1
- sriov: true
- sriov_totalvfs: 63
- vendor: Intel
- eth2:
- driver: tg3
- firmware_version: FFV21.81.3 bc 5720-v1.39
- interface: Ethernet
- mac: 18:66:da:7e:ed:ad
- management: false
- model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
- name: eno1
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- eth3:
- driver: tg3
- firmware_version: FFV21.81.3 bc 5720-v1.39
- interface: Ethernet
- mac: 18:66:da:7e:ed:ae
- management: false
- model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
- name: eno2
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- eth4:
- driver: tg3
- firmware_version: FFV21.81.3 bc 5720-v1.39
- interface: Ethernet
- mac: 18:66:da:7e:ed:af
- management: false
- model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
- name: eno3
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- eth5:
- driver: tg3
- firmware_version: FFV21.81.3 bc 5720-v1.39
- interface: Ethernet
- mac: 18:66:da:7e:ed:b0
- management: false
- model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
- name: eno4
- 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: 20971520
- ht_capable: true
- instruction_set: x86-64
- microcode: '0xb00003e'
- model: Intel Xeon
- other_description: Intel(R) Xeon(R) CPU E5-2620 v4 @ 2.10GHz
- vendor: Intel
- version: E5-2620 v4
- storage_devices:
- pci-0000:01:00.0-scsi-0:2:0:0:
- by_id: "/dev/disk/by-id/wwn-0x6847beb0d74b9f00234f777e59eced29"
- by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
- firmware_version: 4.3
- model: PERC H330 Mini
- size: 598879502336
- storage: HDD
- supported_job_types:
- virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
index 0e632a0fcf1..aa981ec1592 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
@@ -9,6 +9,9 @@ queues:
- admin
nodes:
+ nova-20:
+ status: retired
+
nova-[1-23]:
processor:
microarchitecture: Broadwell
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index af1845da0c3..62988cfc18e 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -112,7 +112,7 @@ force10:
41: nova-17
42: nova-18
43: nova-19
- 44: nova-20
+ 44:
45: nova-21
46: nova-22
47: nova-23
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index b8a3808a85a..823a55fca64 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -444,7 +444,6 @@ pdus:
23: nova-17
24: nova-18
25: nova-19
- 26: nova-20
27: nova-21
28: nova-22
29: nova-23
--
GitLab