diff --git a/data/grid5000/sites/sophia/servers/api-proxy.json b/data/grid5000/sites/sophia/servers/api-proxy.json
index 6089b7891ca48ec07073f531e4145c4b97fe7f48..3565828a85cb4cb71d8383a079a6d27b82f93a32 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 e74797d398b6b9c3a223069ff2bd068e7ad3907a..fa729b8eaf4f0e715ff8b05d39ac0df42503dede 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 8cb6c7a049fd4242309f5082789476ce3bdaa54f..67dfec09155ad4e5f53866718a7391c7b63cc1a0 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 8a6bdd5c4475588d9dc19ed885b68b198ec2a7b2..b84e55421968337d6f6fae58ccef7ded095d1311 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 6f3c3857e04fa55a568a58dd1f0228e77f0f0fea..9f4c9a1df1d1c648df7ae2a83c65d2860da9dac8 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 985746de2e28d548895fd993cffeee2976a55c44..4dce763d49ca1163bee3d3fe4eb26580e14066cb 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 b85f73b2f2f8179d7572a2b6b2d5b31a30129af5..1ebf36bd8acda5c90d5443f5073c33302f108b50 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 534aec4209cf901be9384989a906aea268c26285..41b9379bd1d8884762968e4e7ad8f251e98c3a78 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 941bb47655f13cbc80214c73c44fa842e8b3ec65..fc7d0e1141b8c91e9bb53e5c5f922986d395eabc 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 b5e66fa9b8410932998b17126852e3e151e28520..e3d6291b937207abcc71846521aa4428ea164083 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 3a632b63a0808795bd65ef0da9d98e666842d29e..5bf218574e3e7017584158f079638d832ecea95c 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 76ec08b29389b5d1beedcbe15da91b73c7d8912b..5c28254ef526ffd9747248c59cf3d5f9583eb0bf 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 9d1912a185827cc381b3c24365d98db120dcdf87..74cb2d25a56f558ff6d97c25d9803d74218d9b11 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 fbc3e8cd2523c7849bee9f8fec8d5da029832874..06088410fea71655165f7eb5479aa272a578adcd 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 512304b7d397f39a7e68537b9b05fb6a20c397ba..5b7bec059ddf4b8cd85469d9577111baa7624c4b 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 61493aa8259a5412bb60e71d2265d658690aa3d8..848b108f7cf998736b513c2293a8db73a68b90f6 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 60f86c59126d7f3c802a770564ba8fc677e179a2..42717650709174cc5a1e794809ca347719649e68 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 339b15157332e94a05f8300a00a0fb37d4e66344..91575582270ebeb3f532b479184f59bfe47c69c1 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 e6fdaafe4c4464ce910075ce5af6c24503f55d40..a53d1c58422c36b72db3fa69eca49318ab8c49be 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 31536190c3fdda68d37a9953c84d290c52ff6754..f318336ce9cf184f0fc35b22f13c5164437d9897 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 c5ac2d429099d3d391e547569de62052bdc9dda5..f0692b07fdb2f0ef1a0b143c1e4084d27f1a7f33 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: