From fb40dfb4afb5914a56a375124fb2dee8987eb9fa Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Tue, 14 Jan 2025 09:40:22 +0100
Subject: [PATCH] Revert "Merge branch 'bug16410' into 'master'"
This reverts merge request !922
---
data/grid5000/sites/sophia/servers/srv-data1.json | 8 ++++++--
data/grid5000/sites/sophia/servers/srv-data2.json | 8 ++++++--
input/grid5000/sites/sophia/servers/physical.yaml | 8 ++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/sophia/servers/srv-data1.json b/data/grid5000/sites/sophia/servers/srv-data1.json
index cecd84473e0..d1280d43044 100644
--- a/data/grid5000/sites/sophia/servers/srv-data1.json
+++ b/data/grid5000/sites/sophia/servers/srv-data1.json
@@ -7,10 +7,14 @@
"kind": "physical",
"network_adapters": {
"bmc": {
- "ip": "172.17.143.3"
+ "ip": "172.17.143.3",
+ "mac": "5C:ED:8C:F5:E4:0E",
+ "mounted": true
},
"default": {
- "ip": "172.16.143.3"
+ "ip": "172.16.143.3",
+ "mac": "d4:04:e6:b7:9a:82",
+ "mounted": true
}
},
"redfish": true,
diff --git a/data/grid5000/sites/sophia/servers/srv-data2.json b/data/grid5000/sites/sophia/servers/srv-data2.json
index 2a83d43863e..bcefdc59c32 100644
--- a/data/grid5000/sites/sophia/servers/srv-data2.json
+++ b/data/grid5000/sites/sophia/servers/srv-data2.json
@@ -7,10 +7,14 @@
"kind": "physical",
"network_adapters": {
"bmc": {
- "ip": "172.17.143.4"
+ "ip": "172.17.143.4",
+ "mac": "5C:ED:8C:F5:E3:28",
+ "mounted": true
},
"default": {
- "ip": "172.16.143.4"
+ "ip": "172.16.143.4",
+ "mac": "d4:04:e6:b7:08:d2",
+ "mounted": true
}
},
"redfish": true,
diff --git a/input/grid5000/sites/sophia/servers/physical.yaml b/input/grid5000/sites/sophia/servers/physical.yaml
index 3d243be3d44..375fadc0295 100644
--- a/input/grid5000/sites/sophia/servers/physical.yaml
+++ b/input/grid5000/sites/sophia/servers/physical.yaml
@@ -49,9 +49,13 @@ srv-data1:
serial: CZ2D1N06BM
network_adapters:
default:
+ mounted: true
ip: 172.16.143.3
+ mac: d4:04:e6:b7:9a:82
bmc:
+ mounted: true
ip: 172.17.143.3
+ mac: 5C:ED:8C:F5:E4:0E
group_storage:
name: srv-data1
size: 198000000000000
@@ -63,9 +67,13 @@ srv-data2:
serial: CZ2D1N06BL
network_adapters:
default:
+ mounted: true
ip: 172.16.143.4
+ mac: d4:04:e6:b7:08:d2
bmc:
+ mounted: true
ip: 172.17.143.4
+ mac: 5C:ED:8C:F5:E3:28
group_storage:
name: srv-data2
size: 198000000000000
--
GitLab