From f9b7aec22bd1edbca61c210ff8440e91b6c92c7e Mon Sep 17 00:00:00 2001 From: Colin Regal-Mezin <colin.regal-mezin@inria.fr> Date: Thu, 27 Mar 2025 09:39:43 +0100 Subject: [PATCH] [strasbourg][engelbourg]Remove BMC from engelbourg description --- .../clusters/engelbourg/nodes/engelbourg-1.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-2.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-3.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-4.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-5.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-6.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-7.json | 13 +------------ .../clusters/engelbourg/nodes/engelbourg-8.json | 15 ++------------- .../clusters/engelbourg/engelbourg.yaml | 8 +------- .../clusters/engelbourg/nodes/engelbourg-8.yaml | 2 +- 10 files changed, 11 insertions(+), 105 deletions(-) diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json index 976b0de3c2b..0758f8d6cc6 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.1", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-1-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json index 220b99bc71f..6c0ac290347 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.2", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-2-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json index 29479ae41e4..623d2395260 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.3", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-3-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json index 72ef07abb19..8499a2cfa3b 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.4", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-4-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json index b91621feae7..8862e761f58 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.5", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-5-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json index f36bd058a38..22c07121eaa 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.6", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-6-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json index 1bf347fbbfc..3557a8f32a0 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.7", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-7-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json index 3da0f4933ad..1acb07ab1c6 100644 --- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json +++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json @@ -11,7 +11,7 @@ "vendor": "American Megatrends Inc.", "version": "R1.00.E4" }, - "bmc_version": "15.00", + "bmc_version": "unknown", "chassis": { "manufactured_at": "1970-01-01", "manufacturer": "Default string", @@ -24,7 +24,7 @@ "ram_size": 8589934592 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "none", "ipmitool": { "retries": 5 } @@ -92,17 +92,6 @@ "mountable": false, "mounted": false, "name": "enx020000000002" - }, - { - "device": "bmc", - "enabled": true, - "interface": "Ethernet", - "ip": "172.17.161.8", - "kavlan": false, - "management": true, - "mountable": false, - "mounted": false, - "network_address": "engelbourg-8-bmc.strasbourg.grid5000.fr" } ], "nodeset": "engelbourg", diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml index fd786493f96..03f52cdfeab 100644 --- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml +++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml @@ -22,12 +22,6 @@ nodes: model: Intel(R) Pentium(R) version: D1517 network_adapters: - bmc: - interface: Ethernet - management: true - enabled: true - mountable: false - mounted: false eth0: enabled: true mountable: true @@ -39,6 +33,6 @@ nodes: software: standard-environment: debian11-x64-std # TODO: check that architecture is OK management_tools: - bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm) + bmc_vendor_tool: "none" nodeset: engelbourg # TODO: rename cluster diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml index 3f654ffdd06..ec22dff2220 100644 --- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml +++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml @@ -11,7 +11,7 @@ engelbourg-8: release_date: 02/08/2021 vendor: American Megatrends Inc. version: R1.00.E4 - bmc_version: '15.00' + bmc_version: unknown chassis: manufacturer: Default string name: Default string -- GitLab