From c976990dfabe8b551f891e81485200c9f235ab01 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Wed, 16 Apr 2025 17:00:11 +0200
Subject: [PATCH] [strasbourg][engelbourg] Fix pipeline
---
.../clusters/engelbourg/nodes/engelbourg-1.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-2.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-3.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-4.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-5.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-6.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-7.json | 5 +----
.../clusters/engelbourg/nodes/engelbourg-8.json | 5 +----
.../clusters/engelbourg/engelbourg.yaml.erb | 11 +++--------
9 files changed, 11 insertions(+), 40 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 dcc0946dac0..309f56b03ae 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.1",
- "mac": "01:01:01:01:01:01"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.1",
"kavlan": false,
+ "mac": "01:01:01:01:01:01",
"management": true,
"mountable": false,
"mounted": false,
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 5ce7c4f57a9..6d4b4ba397d 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.2",
- "mac": "E0:01:A6:A4:4C:FC"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.2",
"kavlan": false,
+ "mac": "e0:01:a6:a4:4c:fc",
"management": true,
"mountable": false,
"mounted": false,
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 2ca5e85dac4..e1ce3b9b001 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.3",
- "mac": "E0:01:A6:A4:3A:F0"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.3",
"kavlan": false,
+ "mac": "e0:01:a6:a4:3a:f0",
"management": true,
"mountable": false,
"mounted": false,
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 cfcedd7e006..22c0c27143c 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.4",
- "mac": "E0:01:A6:A4:36:04"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.4",
"kavlan": false,
+ "mac": "e0:01:a6:a4:36:04",
"management": true,
"mountable": false,
"mounted": false,
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 86c9bbf9ddc..120cc67b1a7 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.5",
- "mac": "E0:01:A6:A4:3C:08"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.5",
"kavlan": false,
+ "mac": "e0:01:a6:a4:3c:08",
"management": true,
"mountable": false,
"mounted": false,
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 459d0b9eaa8..d7174e4e140 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.6",
- "mac": "E0:01:A6:A4:4B:E4"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.6",
"kavlan": false,
+ "mac": "e0:01:a6:a4:4b:e4",
"management": true,
"mountable": false,
"mounted": false,
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 61177a443d2..ad9d0664b92 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.7",
- "mac": "E0:01:A6:A4:49:28"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.7",
"kavlan": false,
+ "mac": "e0:01:a6:a4:49:28",
"management": true,
"mountable": false,
"mounted": false,
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 2175d8e94a9..c286f4525a4 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -11,10 +11,6 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc": {
- "ip": "172.17.161.8",
- "mac": "E0:01:A6:A4:3B:7C"
- },
"bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
@@ -70,6 +66,7 @@
"interface": "Ethernet",
"ip": "172.17.161.8",
"kavlan": false,
+ "mac": "e0:01:a6:a4:3b:7c",
"management": true,
"mountable": false,
"mounted": false,
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
index 09b7887083c..908f1553f5c 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
@@ -37,11 +37,6 @@ queues:
nodes:
<% (1..nodes_number).each { |i| %>
<%= cluster_name %>-<%= i %>:
- bmc:
- ip: <%= ip_bmc_list[i - 1] %>
- mac: <%= mac_bmc_list[i - 1] %>
- <% } %>
- engelbourg-[1-8]:
chassis:
manufactured_at: 1970-01-01 # TODO: Put date.
warranty_end: 1970-01-01 # TODO: Put date.
@@ -52,8 +47,6 @@ nodes:
processor:
microarchitecture: Broadwell
clock_speed: 1600000000
- model: Intel Pentium
- version: D1517
network_adapters:
bmc:
interface: Ethernet
@@ -61,6 +54,8 @@ nodes:
mountable: false
mounted: false
management: true
+ ip: <%= ip_bmc_list[i - 1] %>
+ mac: <%= mac_bmc_list[i - 1] %>
eth0:
enabled: true
mountable: true
@@ -74,4 +69,4 @@ nodes:
management_tools:
bmc_vendor_tool: none
nodeset: engelbourg # TODO: rename cluster
-
+ <% } %>
--
GitLab