From 837faeffe7f8e6682d28aa76a3b5f2bbdbecfff5 Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Thu, 23 Jan 2025 10:55:03 +0100
Subject: [PATCH] [sophia][bug_16616] modification of virtual.yaml : syntax
adm: vs admin:, remove adm: intercace delaration when not necessary, add
alias to align with other sites
---
.../sites/sophia/servers/api-proxy.json | 3 --
.../sophia/servers/api-server-devel.json | 3 --
.../grid5000/sites/sophia/servers/conman.json | 2 +-
data/grid5000/sites/sophia/servers/dhcp.json | 2 +-
data/grid5000/sites/sophia/servers/dns.json | 6 +--
.../sites/sophia/servers/fsophia.json | 3 ++
.../sites/sophia/servers/kadeploy-devel.json | 2 +-
.../sites/sophia/servers/kadeploy.json | 6 +++
.../sites/sophia/servers/kavlan-1-devel.json | 3 --
.../sites/sophia/servers/kavlan-1.json | 3 --
.../sites/sophia/servers/kavlan-2.json | 3 --
.../sites/sophia/servers/kavlan-3.json | 3 --
.../grid5000/sites/sophia/servers/kavlan.json | 3 ++
data/grid5000/sites/sophia/servers/ldap.json | 3 --
data/grid5000/sites/sophia/servers/mail.json | 3 --
data/grid5000/sites/sophia/servers/mysql.json | 3 --
data/grid5000/sites/sophia/servers/nat.json | 2 +-
data/grid5000/sites/sophia/servers/oar.json | 7 +--
.../grid5000/sites/sophia/servers/syslog.json | 3 --
data/grid5000/sites/sophia/servers/www.json | 3 --
.../sites/sophia/servers/virtual.yaml | 47 +++++++------------
21 files changed, 40 insertions(+), 73 deletions(-)
diff --git a/data/grid5000/sites/sophia/servers/api-proxy.json b/data/grid5000/sites/sophia/servers/api-proxy.json
index 6089b7891ca..3565828a85c 100644
--- a/data/grid5000/sites/sophia/servers/api-proxy.json
+++ b/data/grid5000/sites/sophia/servers/api-proxy.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.111"
- },
"default": {
"ip": "172.16.143.111"
}
diff --git a/data/grid5000/sites/sophia/servers/api-server-devel.json b/data/grid5000/sites/sophia/servers/api-server-devel.json
index e74797d398b..fa729b8eaf4 100644
--- a/data/grid5000/sites/sophia/servers/api-server-devel.json
+++ b/data/grid5000/sites/sophia/servers/api-server-devel.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.117"
- },
"default": {
"ip": "172.16.143.117"
}
diff --git a/data/grid5000/sites/sophia/servers/conman.json b/data/grid5000/sites/sophia/servers/conman.json
index 8cb6c7a049f..67dfec09155 100644
--- a/data/grid5000/sites/sophia/servers/conman.json
+++ b/data/grid5000/sites/sophia/servers/conman.json
@@ -1,7 +1,7 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
+ "adm": {
"ip": "172.17.143.116"
},
"default": {
diff --git a/data/grid5000/sites/sophia/servers/dhcp.json b/data/grid5000/sites/sophia/servers/dhcp.json
index 8a6bdd5c447..b84e5542196 100644
--- a/data/grid5000/sites/sophia/servers/dhcp.json
+++ b/data/grid5000/sites/sophia/servers/dhcp.json
@@ -1,7 +1,7 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
+ "adm": {
"ip": "172.17.143.124"
},
"default": {
diff --git a/data/grid5000/sites/sophia/servers/dns.json b/data/grid5000/sites/sophia/servers/dns.json
index 6f3c3857e04..9f4c9a1df1d 100644
--- a/data/grid5000/sites/sophia/servers/dns.json
+++ b/data/grid5000/sites/sophia/servers/dns.json
@@ -1,9 +1,9 @@
{
+ "alias": [
+ "ns"
+ ],
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.106"
- },
"default": {
"ip": "172.16.143.101"
}
diff --git a/data/grid5000/sites/sophia/servers/fsophia.json b/data/grid5000/sites/sophia/servers/fsophia.json
index 985746de2e2..4dce763d49c 100644
--- a/data/grid5000/sites/sophia/servers/fsophia.json
+++ b/data/grid5000/sites/sophia/servers/fsophia.json
@@ -1,4 +1,7 @@
{
+ "alias": [
+ "frontend"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/sophia/servers/kadeploy-devel.json b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
index b85f73b2f2f..1ebf36bd8ac 100644
--- a/data/grid5000/sites/sophia/servers/kadeploy-devel.json
+++ b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
@@ -1,7 +1,7 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
+ "adm": {
"ip": "172.17.143.105"
},
"default": {
diff --git a/data/grid5000/sites/sophia/servers/kadeploy.json b/data/grid5000/sites/sophia/servers/kadeploy.json
index 534aec4209c..41b9379bd1d 100644
--- a/data/grid5000/sites/sophia/servers/kadeploy.json
+++ b/data/grid5000/sites/sophia/servers/kadeploy.json
@@ -1,6 +1,12 @@
{
+ "alias": [
+ "kadeploy-server"
+ ],
"kind": "virtual",
"network_adapters": {
+ "adm": {
+ "ip": "172.17.143.105"
+ },
"default": {
"ip": "172.16.143.105"
}
diff --git a/data/grid5000/sites/sophia/servers/kavlan-1-devel.json b/data/grid5000/sites/sophia/servers/kavlan-1-devel.json
index 941bb47655f..fc7d0e1141b 100644
--- a/data/grid5000/sites/sophia/servers/kavlan-1-devel.json
+++ b/data/grid5000/sites/sophia/servers/kavlan-1-devel.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.141"
- },
"default": {
"ip": "172.16.143.141"
}
diff --git a/data/grid5000/sites/sophia/servers/kavlan-1.json b/data/grid5000/sites/sophia/servers/kavlan-1.json
index b5e66fa9b84..e3d6291b937 100644
--- a/data/grid5000/sites/sophia/servers/kavlan-1.json
+++ b/data/grid5000/sites/sophia/servers/kavlan-1.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.121"
- },
"default": {
"ip": "172.16.143.121"
}
diff --git a/data/grid5000/sites/sophia/servers/kavlan-2.json b/data/grid5000/sites/sophia/servers/kavlan-2.json
index 3a632b63a08..5bf218574e3 100644
--- a/data/grid5000/sites/sophia/servers/kavlan-2.json
+++ b/data/grid5000/sites/sophia/servers/kavlan-2.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.122"
- },
"default": {
"ip": "172.16.143.122"
}
diff --git a/data/grid5000/sites/sophia/servers/kavlan-3.json b/data/grid5000/sites/sophia/servers/kavlan-3.json
index 76ec08b2938..5c28254ef52 100644
--- a/data/grid5000/sites/sophia/servers/kavlan-3.json
+++ b/data/grid5000/sites/sophia/servers/kavlan-3.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.120"
- },
"default": {
"ip": "172.16.143.123"
}
diff --git a/data/grid5000/sites/sophia/servers/kavlan.json b/data/grid5000/sites/sophia/servers/kavlan.json
index 9d1912a1858..74cb2d25a56 100644
--- a/data/grid5000/sites/sophia/servers/kavlan.json
+++ b/data/grid5000/sites/sophia/servers/kavlan.json
@@ -1,4 +1,7 @@
{
+ "alias": [
+ "kavlan-dhcp"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/sophia/servers/ldap.json b/data/grid5000/sites/sophia/servers/ldap.json
index fbc3e8cd252..06088410fea 100644
--- a/data/grid5000/sites/sophia/servers/ldap.json
+++ b/data/grid5000/sites/sophia/servers/ldap.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.102"
- },
"default": {
"ip": "172.16.143.102"
}
diff --git a/data/grid5000/sites/sophia/servers/mail.json b/data/grid5000/sites/sophia/servers/mail.json
index 512304b7d39..5b7bec059dd 100644
--- a/data/grid5000/sites/sophia/servers/mail.json
+++ b/data/grid5000/sites/sophia/servers/mail.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.109"
- },
"default": {
"ip": "172.16.143.109"
}
diff --git a/data/grid5000/sites/sophia/servers/mysql.json b/data/grid5000/sites/sophia/servers/mysql.json
index 61493aa8259..848b108f7cf 100644
--- a/data/grid5000/sites/sophia/servers/mysql.json
+++ b/data/grid5000/sites/sophia/servers/mysql.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.107"
- },
"default": {
"ip": "172.16.143.107"
}
diff --git a/data/grid5000/sites/sophia/servers/nat.json b/data/grid5000/sites/sophia/servers/nat.json
index 60f86c59126..42717650709 100644
--- a/data/grid5000/sites/sophia/servers/nat.json
+++ b/data/grid5000/sites/sophia/servers/nat.json
@@ -4,7 +4,7 @@
],
"kind": "virtual",
"network_adapters": {
- "admin": {
+ "adm": {
"ip": "172.17.143.110"
},
"default": {
diff --git a/data/grid5000/sites/sophia/servers/oar.json b/data/grid5000/sites/sophia/servers/oar.json
index 339b1515733..91575582270 100644
--- a/data/grid5000/sites/sophia/servers/oar.json
+++ b/data/grid5000/sites/sophia/servers/oar.json
@@ -1,9 +1,10 @@
{
+ "alias": [
+ "oar-server",
+ "oardb"
+ ],
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.104"
- },
"default": {
"ip": "172.16.143.104"
}
diff --git a/data/grid5000/sites/sophia/servers/syslog.json b/data/grid5000/sites/sophia/servers/syslog.json
index e6fdaafe4c4..a53d1c58422 100644
--- a/data/grid5000/sites/sophia/servers/syslog.json
+++ b/data/grid5000/sites/sophia/servers/syslog.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.118"
- },
"default": {
"ip": "172.16.143.118"
}
diff --git a/data/grid5000/sites/sophia/servers/www.json b/data/grid5000/sites/sophia/servers/www.json
index 31536190c3f..f318336ce9c 100644
--- a/data/grid5000/sites/sophia/servers/www.json
+++ b/data/grid5000/sites/sophia/servers/www.json
@@ -1,9 +1,6 @@
{
"kind": "virtual",
"network_adapters": {
- "admin": {
- "ip": "172.17.143.113"
- },
"default": {
"ip": "172.16.143.113"
}
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index c5ac2d42909..f0692b07fdb 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -5,22 +5,18 @@ nat:
network_adapters:
default:
ip: 172.16.143.110
- admin:
+ adm:
ip: 172.17.143.110
api-proxy:
kind: virtual
network_adapters:
default:
ip: 172.16.143.111
- admin:
- ip: 172.17.143.111
api-server-devel:
kind: virtual
network_adapters:
default:
ip: 172.16.143.117
- admin:
- ip: 172.17.143.117
api-server-v3:
kind: virtual
network_adapters:
@@ -31,7 +27,7 @@ conman:
network_adapters:
default:
ip: 172.16.143.116
- admin:
+ adm:
ip: 172.17.143.116
dhcp:
kind: virtual
@@ -39,34 +35,42 @@ dhcp:
default:
ip: 172.16.143.124
ip6: 2001:660:4406:800:0:2:0:18
- admin:
+ adm:
ip: 172.17.143.124
dns:
kind: virtual
+ alias:
+ - ns
network_adapters:
default:
ip: 172.16.143.101
- admin:
- ip: 172.17.143.106
fsophia:
kind: virtual
+ alias:
+ - frontend
network_adapters:
default:
ip: 172.16.143.106
kadeploy:
kind: virtual
+ alias:
+ - kadeploy-server
network_adapters:
default:
ip: 172.16.143.105
+ adm:
+ ip: 172.17.143.105
kadeploy-devel:
kind: virtual
network_adapters:
default:
ip: 172.16.143.127
- admin:
+ adm:
ip: 172.17.143.105
kavlan:
kind: virtual
+ alias:
+ - kavlan-dhcp
network_adapters:
default:
ip: 172.16.143.120
@@ -75,50 +79,39 @@ kavlan-1:
network_adapters:
default:
ip: 172.16.143.121
- admin:
- ip: 172.17.143.121
kavlan-2:
kind: virtual
network_adapters:
default:
ip: 172.16.143.122
- admin:
- ip: 172.17.143.122
kavlan-3:
kind: virtual
network_adapters:
default:
ip: 172.16.143.123
- admin:
- ip: 172.17.143.120
ldap:
kind: virtual
network_adapters:
default:
ip: 172.16.143.102
- admin:
- ip: 172.17.143.102
mail:
kind: virtual
network_adapters:
default:
ip: 172.16.143.109
- admin:
- ip: 172.17.143.109
mysql:
kind: virtual
network_adapters:
default:
ip: 172.16.143.107
- admin:
- ip: 172.17.143.107
oar:
kind: virtual
+ alias:
+ - oar-server
+ - oardb
network_adapters:
default:
ip: 172.16.143.104
- admin:
- ip: 172.17.143.104
puppet6:
kind: virtual
alias:
@@ -136,15 +129,11 @@ syslog:
network_adapters:
default:
ip: 172.16.143.118
- admin:
- ip: 172.17.143.118
www:
kind: virtual
network_adapters:
default:
ip: 172.16.143.113
- admin:
- ip: 172.17.143.113
kavlan-devel:
kind: virtual
network_adapters:
@@ -155,8 +144,6 @@ kavlan-1-devel:
network_adapters:
default:
ip: 172.16.143.141
- admin:
- ip: 172.17.143.141
oar-devel:
kind: virtual
network_adapters:
--
GitLab