From 377e1644c0890e754e0cfafac75ca7303cc109bb Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 10:34:56 +0100
Subject: [PATCH 1/6] Add new srv-data2 server
---
input/grid5000/sites/nantes/servers/physical.yaml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/input/grid5000/sites/nantes/servers/physical.yaml b/input/grid5000/sites/nantes/servers/physical.yaml
index bc7bf0950e5..12f3cf84864 100644
--- a/input/grid5000/sites/nantes/servers/physical.yaml
+++ b/input/grid5000/sites/nantes/servers/physical.yaml
@@ -17,7 +17,7 @@ srv-3:
alias:
- ntp
- adminfront
- - af
+ - af
warranty: 2026-04-25
serial: 9TJRXW2
network_adapters:
@@ -50,3 +50,16 @@ pve-99:
bmc:
ip: 172.17.207.6
mac: 2c:ea:7f:f8:61:72
+
+srv-data2:
+ kind: physical
+ alias: [nfs, home-g5k, public, modules]
+ warranty: 2031-11
+ serial: CZ2D1Z09Z8
+ network_adapters:
+ default:
+ ip: 172.16.207.7
+ mac: 88:e9:a4:8b:09:52
+ bmc:
+ ip: 172.17.207.7
+ mac: 5c:ed:8c:f7:65:04
--
GitLab
From 5976e3e24b083c16266d2192234d3932425f290e Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 10:38:43 +0100
Subject: [PATCH 2/6] add missing generated json
---
.../sites/nantes/servers/srv-data2.json | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 data/grid5000/sites/nantes/servers/srv-data2.json
diff --git a/data/grid5000/sites/nantes/servers/srv-data2.json b/data/grid5000/sites/nantes/servers/srv-data2.json
new file mode 100644
index 00000000000..e134fb5f61e
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/srv-data2.json
@@ -0,0 +1,24 @@
+{
+ "alias": [
+ "nfs",
+ "home-g5k",
+ "public",
+ "modules"
+ ],
+ "kind": "physical",
+ "network_adapters": {
+ "bmc": {
+ "ip": "172.17.207.7",
+ "mac": "5c:ed:8c:f7:65:04"
+ },
+ "default": {
+ "ip": "172.16.207.7",
+ "mac": "88:e9:a4:8b:09:52"
+ }
+ },
+ "redfish": true,
+ "serial": "CZ2D1Z09Z8",
+ "type": "server",
+ "uid": "srv-data2",
+ "warranty": "2031-11"
+}
\ No newline at end of file
--
GitLab
From a63cf47382032bfbf582fe7596c1e8e5e52bd3cc Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 11:05:35 +0100
Subject: [PATCH 3/6] remove alias on srv-data2
---
data/grid5000/sites/nantes/servers/srv-data2.json | 5 +----
input/grid5000/sites/nantes/servers/physical.yaml | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/nantes/servers/srv-data2.json b/data/grid5000/sites/nantes/servers/srv-data2.json
index e134fb5f61e..05428c8a8b8 100644
--- a/data/grid5000/sites/nantes/servers/srv-data2.json
+++ b/data/grid5000/sites/nantes/servers/srv-data2.json
@@ -1,9 +1,6 @@
{
"alias": [
- "nfs",
- "home-g5k",
- "public",
- "modules"
+
],
"kind": "physical",
"network_adapters": {
diff --git a/input/grid5000/sites/nantes/servers/physical.yaml b/input/grid5000/sites/nantes/servers/physical.yaml
index 12f3cf84864..83c8b619c60 100644
--- a/input/grid5000/sites/nantes/servers/physical.yaml
+++ b/input/grid5000/sites/nantes/servers/physical.yaml
@@ -53,7 +53,7 @@ pve-99:
srv-data2:
kind: physical
- alias: [nfs, home-g5k, public, modules]
+ alias: []
warranty: 2031-11
serial: CZ2D1Z09Z8
network_adapters:
--
GitLab
From bb662f74eed029be88370d4e469bdc983dde6f79 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 16:00:13 +0100
Subject: [PATCH 4/6] correct warranty date
---
input/grid5000/sites/nantes/servers/physical.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/input/grid5000/sites/nantes/servers/physical.yaml b/input/grid5000/sites/nantes/servers/physical.yaml
index 83c8b619c60..58a2ea22a70 100644
--- a/input/grid5000/sites/nantes/servers/physical.yaml
+++ b/input/grid5000/sites/nantes/servers/physical.yaml
@@ -54,7 +54,7 @@ pve-99:
srv-data2:
kind: physical
alias: []
- warranty: 2031-11
+ warranty: 2027-12-16
serial: CZ2D1Z09Z8
network_adapters:
default:
--
GitLab
From 3f2b348066187a7e1e9c8a1c5b6fad32f4656f69 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 16:03:07 +0100
Subject: [PATCH 5/6] forget generated file
---
data/grid5000/sites/nantes/servers/srv-data2.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/grid5000/sites/nantes/servers/srv-data2.json b/data/grid5000/sites/nantes/servers/srv-data2.json
index 05428c8a8b8..e09d56391bb 100644
--- a/data/grid5000/sites/nantes/servers/srv-data2.json
+++ b/data/grid5000/sites/nantes/servers/srv-data2.json
@@ -17,5 +17,5 @@
"serial": "CZ2D1Z09Z8",
"type": "server",
"uid": "srv-data2",
- "warranty": "2031-11"
+ "warranty": "2027-12-16"
}
\ No newline at end of file
--
GitLab
From b8ab022dab5e12a686e365352f2e612e6315a8cc Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Fri, 31 Jan 2025 16:24:19 +0100
Subject: [PATCH 6/6] correcting again warranty date
---
data/grid5000/sites/nantes/servers/srv-data2.json | 2 +-
input/grid5000/sites/nantes/servers/physical.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/nantes/servers/srv-data2.json b/data/grid5000/sites/nantes/servers/srv-data2.json
index e09d56391bb..affa721159f 100644
--- a/data/grid5000/sites/nantes/servers/srv-data2.json
+++ b/data/grid5000/sites/nantes/servers/srv-data2.json
@@ -17,5 +17,5 @@
"serial": "CZ2D1Z09Z8",
"type": "server",
"uid": "srv-data2",
- "warranty": "2027-12-16"
+ "warranty": "2031-12-10"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/nantes/servers/physical.yaml b/input/grid5000/sites/nantes/servers/physical.yaml
index 58a2ea22a70..d72805a5e1f 100644
--- a/input/grid5000/sites/nantes/servers/physical.yaml
+++ b/input/grid5000/sites/nantes/servers/physical.yaml
@@ -54,7 +54,7 @@ pve-99:
srv-data2:
kind: physical
alias: []
- warranty: 2027-12-16
+ warranty: 2031-12-10
serial: CZ2D1Z09Z8
network_adapters:
default:
--
GitLab