From d5bbcd1173fb492babe23c2cbbefe3639328c066 Mon Sep 17 00:00:00 2001
From: PARISOT Clement <clement.parisot@inria.fr>
Date: Wed, 26 Feb 2025 09:58:23 +0100
Subject: [PATCH] [grenoble] servers - Add group_storage informations, move
adminfront
---
.../sites/grenoble/servers/dighyp1.json | 3 +--
.../sites/grenoble/servers/dignfs.json | 7 +-----
.../sites/grenoble/servers/pve-1.json | 3 ++-
.../sites/grenoble/servers/srv-data.json | 5 +++++
.../sites/grenoble/servers/srv-data2.json | 5 +++++
.../sites/grenoble/servers/srv-data3.json | 5 +++++
.../sites/grenoble/servers/physical.yaml | 22 +++++++++++++------
7 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/data/grid5000/sites/grenoble/servers/dighyp1.json b/data/grid5000/sites/grenoble/servers/dighyp1.json
index 38c7bca6f16..4b9ff9a9386 100644
--- a/data/grid5000/sites/grenoble/servers/dighyp1.json
+++ b/data/grid5000/sites/grenoble/servers/dighyp1.json
@@ -1,7 +1,6 @@
{
"alias": [
- "adminfront",
- "af"
+
],
"kind": "physical",
"network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/dignfs.json b/data/grid5000/sites/grenoble/servers/dignfs.json
index c37e60b6d09..e09e9f59536 100644
--- a/data/grid5000/sites/grenoble/servers/dignfs.json
+++ b/data/grid5000/sites/grenoble/servers/dignfs.json
@@ -1,12 +1,7 @@
{
"alias": [
-
+ "storage1-old"
],
- "group_storage": {
- "name": "storage1",
- "rate": 50000000000,
- "size": 55000000000000
- },
"kind": "physical",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/grenoble/servers/pve-1.json b/data/grid5000/sites/grenoble/servers/pve-1.json
index 8cc9fb6a71a..6c6fb5210f4 100644
--- a/data/grid5000/sites/grenoble/servers/pve-1.json
+++ b/data/grid5000/sites/grenoble/servers/pve-1.json
@@ -1,6 +1,7 @@
{
"alias": [
- "ntp"
+ "ntp",
+ "adminfront"
],
"kind": "physical",
"network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data.json b/data/grid5000/sites/grenoble/servers/srv-data.json
index 62aef659dd0..8408728369c 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data.json
@@ -6,6 +6,11 @@
"modules",
"storage1"
],
+ "group_storage": {
+ "name": "storage1",
+ "rate": 25000000000,
+ "size": 162001569447936
+ },
"kind": "physical",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data2.json b/data/grid5000/sites/grenoble/servers/srv-data2.json
index bc2a372a3d0..1f31630c857 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data2.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data2.json
@@ -2,6 +2,11 @@
"alias": [
"storage2"
],
+ "group_storage": {
+ "name": "storage2",
+ "rate": 25000000000,
+ "size": 162001569447936
+ },
"kind": "physical",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data3.json b/data/grid5000/sites/grenoble/servers/srv-data3.json
index a3cf93ee0e9..33219ccb7a7 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data3.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data3.json
@@ -2,6 +2,11 @@
"alias": [
"storage3"
],
+ "group_storage": {
+ "name": "storage3",
+ "rate": 100000000000,
+ "size": 360003477176320
+ },
"kind": "physical",
"network_adapters": {
"adm": {
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index d2ffbf5304a..b237cf88c8f 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/input/grid5000/sites/grenoble/servers/physical.yaml
@@ -14,7 +14,7 @@ digsed:
dighyp1:
kind: physical
- alias: [adminfront, af]
+ alias: []
warranty: 2024-10-19
serial: 5SS15M2
network_adapters:
@@ -57,7 +57,7 @@ digwatt:
dignfs:
kind: physical
- alias: []
+ alias: [storage1-old]
warranty: 2025-10-06
serial: 57JV173
network_adapters:
@@ -68,16 +68,12 @@ dignfs:
mac: 2C:EA:7F:42:45:35
adm:
ip: 172.17.31.12
- group_storage:
- name: storage1
- size: 55000000000000
- rate: 50000000000
pve-1:
kind: physical
warranty: 2031-07-11
serial: CZJD1700JN
- alias: [ntp]
+ alias: [ntp, adminfront]
network_adapters:
default:
ip: 172.16.31.13
@@ -117,6 +113,10 @@ srv-data:
mac: 5C:ED:8C:F4:A1:EE
adm:
ip: 172.17.31.15
+ group_storage:
+ name: storage1
+ size: 162_001_569_447_936
+ rate: 25_000_000_000
srv-data2:
kind: physical
@@ -132,6 +132,10 @@ srv-data2:
mac: 5C:ED:8C:F4:64:78
adm:
ip: 172.17.31.16
+ group_storage:
+ name: storage2
+ size: 162_001_569_447_936
+ rate: 25_000_000_000
srv-data3:
kind: physical
@@ -147,3 +151,7 @@ srv-data3:
mac: 5C:ED:8C:F4:A2:22
adm:
ip: 172.17.31.17
+ group_storage:
+ name: storage3
+ size: 360_003_477_176_320
+ rate: 100_000_000_000
--
GitLab