From 3bf4603f8147894d3f7ddc668c3e55a5d12ade78 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Fri, 20 Sep 2024 15:41:01 +0200
Subject: [PATCH] [lille] Remove welsh and moove adminfront to pve-1
---
data/grid5000/sites/lille/servers/pve-1.json | 5 +++
data/grid5000/sites/lille/servers/welsh.json | 37 -------------------
.../sites/lille/servers/physical.yaml | 28 ++------------
3 files changed, 9 insertions(+), 61 deletions(-)
delete mode 100644 data/grid5000/sites/lille/servers/welsh.json
diff --git a/data/grid5000/sites/lille/servers/pve-1.json b/data/grid5000/sites/lille/servers/pve-1.json
index 4e1fb493089..92a6f6c8609 100644
--- a/data/grid5000/sites/lille/servers/pve-1.json
+++ b/data/grid5000/sites/lille/servers/pve-1.json
@@ -1,4 +1,9 @@
{
+ "alias": [
+ "ntp",
+ "af",
+ "adminfront"
+ ],
"kind": "physical",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/lille/servers/welsh.json b/data/grid5000/sites/lille/servers/welsh.json
deleted file mode 100644
index b16cb8834b7..00000000000
--- a/data/grid5000/sites/lille/servers/welsh.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "alias": [
- "ntp",
- "af",
- "adminfront"
- ],
- "kind": "physical",
- "network_adapters": {
- "adm": {
- "ip": "172.17.47.1",
- "mac": "24:6e:96:2c:9a:42"
- },
- "bmc": {
- "ip": "172.17.46.1",
- "mac": "84:7b:eb:d5:ae:46"
- },
- "default": {
- "ip": "172.16.47.1",
- "mac": "24:6e:96:2c:9a:40"
- }
- },
- "pdu": [
- {
- "port": 6,
- "uid": "pdu-b2p1"
- },
- {
- "port": 6,
- "uid": "pdu-b2p2"
- }
- ],
- "redfish": true,
- "serial": "5L2DLG2",
- "type": "server",
- "uid": "welsh",
- "warranty": "2023-09-12"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml
index 29361ed2a69..281ff36534f 100644
--- a/input/grid5000/sites/lille/servers/physical.yaml
+++ b/input/grid5000/sites/lille/servers/physical.yaml
@@ -1,28 +1,4 @@
---
-welsh:
- kind: physical
- alias:
- - ntp
- - af
- - adminfront
- warranty: 2023-09-12
- serial: 5L2DLG2
- network_adapters:
- default:
- ip: 172.16.47.1
- mac: 24:6e:96:2c:9a:40
- adm:
- ip: 172.17.47.1
- mac: 24:6e:96:2c:9a:42
- bmc:
- ip: 172.17.46.1
- mac: 84:7b:eb:d5:ae:46
- pdu:
- - uid: pdu-b2p1
- port: 6
- - uid: pdu-b2p2
- port: 6
-
chiterne:
kind: physical
warranty: 2024-01-25
@@ -129,6 +105,10 @@ granche-srv2:
pve-1:
kind: physical
+ alias:
+ - ntp
+ - af
+ - adminfront
warranty: 2030-04-13
serial: CZJ3090BP2
network_adapters:
--
GitLab