diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 47ad40aaf08f8440440084a96b5504894b6a9591..bf9792dec0e55dab5c8276bf5b9fd5c5fbb06df2 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.131",
+      "ip": "172.16.18.131",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-1.grenoble.grid5000.fr",
+      "network_address": "adonis-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 1911c50938c9cc52e026d81705618a154caa3de3..36f1abce5f9a6bdddd072b2e633d29e5346e29c5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.140",
+      "ip": "172.16.18.140",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-10.grenoble.grid5000.fr",
+      "network_address": "adonis-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index d8b1b2ee8e1adaf979cdd21c74d2a58f249a0dd5..5e213f6430a630b6f555e13a5f0eb2a31e4d8648 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.141",
+      "ip": "172.16.18.141",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-11.grenoble.grid5000.fr",
+      "network_address": "adonis-11-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index 35041fdef435272dea93f500d8f2956c49b8ef98..194aa66206051fe168172c039a27e4bb6fce89c3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.142",
+      "ip": "172.16.18.142",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-12.grenoble.grid5000.fr",
+      "network_address": "adonis-12-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index cf303242179a52cd052e6efc68a72248bfa05783..081d3267b07f749ea34402755985746b09fcb867 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.132",
+      "ip": "172.16.18.132",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-2.grenoble.grid5000.fr",
+      "network_address": "adonis-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 399ecbd27ceb010ea23039ce71599b5dc037394e..82c3d76e365c48a6ed692861c64326638db702b7 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.133",
+      "ip": "172.16.18.133",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-3.grenoble.grid5000.fr",
+      "network_address": "adonis-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 4db950912d8c7f2a4ae8081d01919bb10e170c36..f771604be9187ff244da976f6a224b921e0abe13 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.134",
+      "ip": "172.16.18.134",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-4.grenoble.grid5000.fr",
+      "network_address": "adonis-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index beb9580b2149fee52e089bc37558178bf746b9d0..9c6ae9c9f60ca3227dd3eefd809e072e4715a8ac 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.135",
+      "ip": "172.16.18.135",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-5.grenoble.grid5000.fr",
+      "network_address": "adonis-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index d4744f09501c880efc04f0932fa7049cd018c429..7d9e1071b8c290a5f58f9fce3b183d4f2e1014e2 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.136",
+      "ip": "172.16.18.136",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-6.grenoble.grid5000.fr",
+      "network_address": "adonis-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 79eb8c82ac3d5b53b47bd79beeeb40e81c06dd71..3b719cf74d830f78bd1f03f73c615ad7cf80a2f5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.137",
+      "ip": "172.16.18.137",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-7.grenoble.grid5000.fr",
+      "network_address": "adonis-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index 683474667a4f8d46f69138124d0a5d8b68367de4..9d3e64afbc48c9dba9620eb00cf8af53dda9e571 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.138",
+      "ip": "172.16.18.138",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-8.grenoble.grid5000.fr",
+      "network_address": "adonis-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index ef619087adf74c09084cea1b39e2bbcbd07b9a1c..4df2f72301e64b2c507537bfdd33af8cfef8d74e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.139",
+      "ip": "172.16.18.139",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-9.grenoble.grid5000.fr",
+      "network_address": "adonis-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 939b4e213f413a0a0e048e753d3ab5ed21ccc000..64d0384e6928a5df8a73b459b3e7c4ad1ed52b28 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.51",
+      "ip": "172.16.18.51",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-1.grenoble.grid5000.fr",
+      "network_address": "edel-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index f52fae55a1bced0c8dbb375f4e18d01426d41c2a..2daa4b8ed148b7e9c3c8e9d7368687e42ad65e04 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.60",
+      "ip": "172.16.18.60",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-10.grenoble.grid5000.fr",
+      "network_address": "edel-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 4e711bef356b7e360ff7b04e8d0719f6f6537c1c..80d430496ecb67ff65126af80fa39c8f7a2d32a9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.61",
+      "ip": "172.16.18.61",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-11.grenoble.grid5000.fr",
+      "network_address": "edel-11-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 09e83553be2c4cac723d276426e649f21c0d7c06..020e09e482d84d657dcd45aab9308af34fffb100 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.62",
+      "ip": "172.16.18.62",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-12.grenoble.grid5000.fr",
+      "network_address": "edel-12-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 3159f6fd3c347e6a5a6dc4a3d2aab0b4c11f3c39..d24d6a400541833eaf1929b838c04fb2701e3981 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.63",
+      "ip": "172.16.18.63",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-13.grenoble.grid5000.fr",
+      "network_address": "edel-13-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index 18dab92a7cc090640b1818f1940577391e628c78..e9657eff0374f14af7240cbb58a5a211ab802802 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.64",
+      "ip": "172.16.18.64",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-14.grenoble.grid5000.fr",
+      "network_address": "edel-14-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 757f4b756f48b03bfd79944f81b217664fbd4753..e17085c59d8a4705a047c5bd728598cd5f5b7a3d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.65",
+      "ip": "172.16.18.65",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-15.grenoble.grid5000.fr",
+      "network_address": "edel-15-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index c92d392a92ec5c380e9dd2dc94084161345c3b8d..dcf0811f105781e1602f812fb0ba9c61b6d979fc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.66",
+      "ip": "172.16.18.66",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-16.grenoble.grid5000.fr",
+      "network_address": "edel-16-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index d8d5837433012d1952381b1f79423eb5ce812bfd..8afc339a168529ad4fec1f27961cc5a554327709 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.67",
+      "ip": "172.16.18.67",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-17.grenoble.grid5000.fr",
+      "network_address": "edel-17-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index e1ef3ceec9bdd34bc204f193f88d73d5e6f3ca9e..4aa959815a6bb2b533ea23b39142dae25d059539 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.68",
+      "ip": "172.16.18.68",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-18.grenoble.grid5000.fr",
+      "network_address": "edel-18-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 041a76919d8a4ee81cdc440fc6419453ce6708d9..cfce34d433f8e2a40b345ec0e3ff0eb819a6412e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.69",
+      "ip": "172.16.18.69",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-19.grenoble.grid5000.fr",
+      "network_address": "edel-19-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index 8c712d48caacaf975c80d2f51211369acc6d67f7..020231e769b7c13d4332b0f4f366e04baf0a6db9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.52",
+      "ip": "172.16.18.52",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-2.grenoble.grid5000.fr",
+      "network_address": "edel-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index c7af133ed1434e708453b385a88c9e6085bbc400..0127f81188189a9398fdac1240828abe96121c9b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.70",
+      "ip": "172.16.18.70",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-20.grenoble.grid5000.fr",
+      "network_address": "edel-20-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index bdb5b28b865b754d4f34737e9eaa17ac1a34ea2f..53e88b197646230df34057dbf3b79bc232fd672e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.71",
+      "ip": "172.16.18.71",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-21.grenoble.grid5000.fr",
+      "network_address": "edel-21-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 095bc6627e924ceab6788bfbbf4ee4b953f710d0..68772a40615f50e4a50215be163e8ee7b0282e55 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.72",
+      "ip": "172.16.18.72",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-22.grenoble.grid5000.fr",
+      "network_address": "edel-22-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index 17498d13ae5d3b3be10ae9e402158e049ab3f03e..525865886d2c9d19344c932c0fb31b654cbbe530 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.73",
+      "ip": "172.16.18.73",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-23.grenoble.grid5000.fr",
+      "network_address": "edel-23-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 14abc6ba3c2e5fd8aea74e6eff6e1d636f406148..db3585d55a84c79a5e179dcbf2d7dbd0ebd6f3a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.74",
+      "ip": "172.16.18.74",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-24.grenoble.grid5000.fr",
+      "network_address": "edel-24-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index f1ea081375d901ef8e1ba7719b737296e5764359..3bf826607849538f924cc62177f5a7564d59d36d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.75",
+      "ip": "172.16.18.75",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-25.grenoble.grid5000.fr",
+      "network_address": "edel-25-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 12267fdb0a5e28300e627890e526eb5d87ca1bb0..208c835f4754346290237add84ddccca8d15ed3e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.76",
+      "ip": "172.16.18.76",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-26.grenoble.grid5000.fr",
+      "network_address": "edel-26-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 96cd68a018f72c2c3b48b3265fd95f52745a1be7..d8515ff185cd6f4877e488f57c6ece9a75271571 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.77",
+      "ip": "172.16.18.77",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-27.grenoble.grid5000.fr",
+      "network_address": "edel-27-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index f77fc74541c71cf9106d822e225b7c88a55a80e7..43a7cf9da528783c76b6ac6617e5dbde335253ae 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.78",
+      "ip": "172.16.18.78",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-28.grenoble.grid5000.fr",
+      "network_address": "edel-28-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index a236f9c9fe842c2890c552e444e57fdc9ed24f5d..459c21adf61403f794eac28dfcd555d25dd8b9ea 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.79",
+      "ip": "172.16.18.79",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-29.grenoble.grid5000.fr",
+      "network_address": "edel-29-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index 3e02e3b819617e0e35f96b369f478cf3d7a63d06..bdc615d569dc5875a19a9aa0a40fb600497987e7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.53",
+      "ip": "172.16.18.53",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-3.grenoble.grid5000.fr",
+      "network_address": "edel-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 6e57f6f34a547552091df071ec0ae42b265d70df..8e5693fcf916e3394a0b4c297801b22bfd125742 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.80",
+      "ip": "172.16.18.80",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-30.grenoble.grid5000.fr",
+      "network_address": "edel-30-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 9dc7afea14632223171c48166d7b516f76ccc43d..562efd045bd6e85e56ffa7baf4d96a5fe6c377e5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.81",
+      "ip": "172.16.18.81",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-31.grenoble.grid5000.fr",
+      "network_address": "edel-31-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 78f51bce1515fccaec2618c4b0dba65fc5ff49a5..5069121e1bda1fab9d3dd7509fec4e9e64f5ae70 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.82",
+      "ip": "172.16.18.82",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-32.grenoble.grid5000.fr",
+      "network_address": "edel-32-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index c50df7e4aea297de9c0a80d8cf2dff23d63cffd2..a9a8e0a49f70214af1d61526e6c033054e97fb56 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.83",
+      "ip": "172.16.18.83",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-33.grenoble.grid5000.fr",
+      "network_address": "edel-33-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index dfab0c102d1a19a70410eb9bd5df79794667efa8..9f23e6ccc4d8d6f4b8f2f281ba16eb13be38755f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.84",
+      "ip": "172.16.18.84",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-34.grenoble.grid5000.fr",
+      "network_address": "edel-34-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 3389205b55fc896bf4a02856f6353317a24a5592..bbf4847b76e55b53c1c393c4f735ed2768839966 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.85",
+      "ip": "172.16.18.85",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-35.grenoble.grid5000.fr",
+      "network_address": "edel-35-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index a382eda1a72566ad4b4b100c50851a3e6e9249b9..4d051298c56747e294ad287465844d7064f87fc7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.86",
+      "ip": "172.16.18.86",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-36.grenoble.grid5000.fr",
+      "network_address": "edel-36-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 01b4656a43b583b4322da9983a8bdf64d73fb068..bb8569383bee97b1d90c8bfd4b02ba4f689db042 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.87",
+      "ip": "172.16.18.87",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-37.grenoble.grid5000.fr",
+      "network_address": "edel-37-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index 92ae9fa337d8914af631ea5e39e5c3c49c976edf..52396ffd72ae9a684ef5ad6e71c4eb2bf418e018 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.88",
+      "ip": "172.16.18.88",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-38.grenoble.grid5000.fr",
+      "network_address": "edel-38-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 3159e754637a642482f270292012f957ddfddf68..7e3349614c78de06fe8e5d58b934fe4e344571b4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.89",
+      "ip": "172.16.18.89",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-39.grenoble.grid5000.fr",
+      "network_address": "edel-39-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 54aad2081cb6ab55dba008dc1329c9c1f3258878..b1cb6eec0dd8b6026390027bd4305f48315d11ca 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.54",
+      "ip": "172.16.18.54",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-4.grenoble.grid5000.fr",
+      "network_address": "edel-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 9a7c5e6890a7a762660e4a5e68a5437739d7a258..762dd200486c1ffa48fc17384e5691465d704be3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.90",
+      "ip": "172.16.18.90",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-40.grenoble.grid5000.fr",
+      "network_address": "edel-40-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index e18fd8cb7b16ed026163d91327eee5b903daabb2..43d88472600cd49360a53ff5d00d3cff9e4b9240 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.91",
+      "ip": "172.16.18.91",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-41.grenoble.grid5000.fr",
+      "network_address": "edel-41-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 5b3f677ba5eec3acb5bf4b0517a1e0295f240eaf..48409133a70f3198332fb5dd6f3decea9d6a3e7f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.92",
+      "ip": "172.16.18.92",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-42.grenoble.grid5000.fr",
+      "network_address": "edel-42-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 6ee524723fc23c348c7ba3cf9c7d139d6520dc9a..1987b9be9ce7f761b432cea7ed518206f00eb81d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.93",
+      "ip": "172.16.18.93",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-43.grenoble.grid5000.fr",
+      "network_address": "edel-43-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index 2e341c2075399dc3a44ae5ba5312c1c95bf7c124..5d8d1aa02c52118104c6ad335b7fb85e11e6e4a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.94",
+      "ip": "172.16.18.94",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-44.grenoble.grid5000.fr",
+      "network_address": "edel-44-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index 8897c018e1bbed08c1678443765246203ecc8697..30ca03a4cf45983b04265148a863e8e36aba57d1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.95",
+      "ip": "172.16.18.95",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-45.grenoble.grid5000.fr",
+      "network_address": "edel-45-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 5839524f0e879c6752c002f3a1dbcf15f8d361d8..c8d13e89efb7ff772b96673285961efe2f797fe5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.96",
+      "ip": "172.16.18.96",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-46.grenoble.grid5000.fr",
+      "network_address": "edel-46-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 11f14627f33bf00edcd0d3198898d9e10e3ee4a7..f000ce3e7eaa2199a83a0780921d6e3a23d3e977 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.97",
+      "ip": "172.16.18.97",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-47.grenoble.grid5000.fr",
+      "network_address": "edel-47-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 1c393fb5f51d9e28c586ec13a35fefdeab22fa66..01495483ee32c2a04bc550ea00eb0b45fd2ab46f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.98",
+      "ip": "172.16.18.98",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-48.grenoble.grid5000.fr",
+      "network_address": "edel-48-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index 72f41130defe1bf5f9f5dfcaefa5aa0f0447244c..b7722a96514ec8905b2075b9fc84bec6d410cc63 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.99",
+      "ip": "172.16.18.99",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-49.grenoble.grid5000.fr",
+      "network_address": "edel-49-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 1dff97b9120048d101207e753f2576631e354e1e..8f50ca6425e4701fd8e3fcdc50052970ccc0af7a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.55",
+      "ip": "172.16.18.55",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-5.grenoble.grid5000.fr",
+      "network_address": "edel-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index b6121a3790ab7092546a04b20fa4e418412f7699..8260e933502118aa94c23590aaf474b10766b5d5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.100",
+      "ip": "172.16.18.100",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-50.grenoble.grid5000.fr",
+      "network_address": "edel-50-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 7dd09b6df64fb0c3f52a1904f9a24a8a67418667..64db96e507349a918361d8c6fc29e4c58a9c1b3d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.101",
+      "ip": "172.16.18.101",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-51.grenoble.grid5000.fr",
+      "network_address": "edel-51-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 6ddff92ff086e0b9fd9dfe7da63c2ab35470733d..6bdf09ed0b164250399b37c06f19c6f45bd141f6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.102",
+      "ip": "172.16.18.102",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-52.grenoble.grid5000.fr",
+      "network_address": "edel-52-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index eb0dbbe01bf0da0a49e1952d2ade190dd92a4c14..532343c73916508e741152c4d0dc78a070888c25 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.103",
+      "ip": "172.16.18.103",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-53.grenoble.grid5000.fr",
+      "network_address": "edel-53-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 4785f64d1a3747c176f06f51ccf82a5fdda0ed52..328f0e99aefb3b74ac4378056d05d55e46999676 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.104",
+      "ip": "172.16.18.104",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-54.grenoble.grid5000.fr",
+      "network_address": "edel-54-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 6d25e8e8a84a441912d273d5abc9e46d91881311..3dfc25f7a472ca1cbfd17d53f6592ca47b97090c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.105",
+      "ip": "172.16.18.105",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-55.grenoble.grid5000.fr",
+      "network_address": "edel-55-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 87990a40466e33ecd6762d2731828110a1b5ec03..ceb1998c51bf83f155192267a6a33699075f4de4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.106",
+      "ip": "172.16.18.106",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-56.grenoble.grid5000.fr",
+      "network_address": "edel-56-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 674dea27e21393d560699a9082e81de5c29ffbe8..01fa34afb7cf6b752e1c15d06f65ea3868c886df 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.107",
+      "ip": "172.16.18.107",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-57.grenoble.grid5000.fr",
+      "network_address": "edel-57-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index 45bdfc16a75b2d26c6e6053d8c8ec45f84670397..4a6127cc18acd7d32602a8e7d3109d70921789a6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.108",
+      "ip": "172.16.18.108",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-58.grenoble.grid5000.fr",
+      "network_address": "edel-58-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 35e283cdad872b98f5e152bf7bcc5c8c3f4d0df8..44103c26cd13c4de4e4e6b64a3b46e5e390baf4e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.109",
+      "ip": "172.16.18.109",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-59.grenoble.grid5000.fr",
+      "network_address": "edel-59-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 97e9aa636524918d52db597c9a25ae53adba785f..695f21d29701517e39e58f2cd6b057671ceb063c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.56",
+      "ip": "172.16.18.56",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-6.grenoble.grid5000.fr",
+      "network_address": "edel-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 77d5b34a58346342832405dd26f0c34fca6cf8f3..eb026c836bb334373e0ba606b5b49852708d4ad8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.110",
+      "ip": "172.16.18.110",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-60.grenoble.grid5000.fr",
+      "network_address": "edel-60-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index e6d8d7af505a66014930791917107832931046af..db7b22f93e9cc6980873714b437e4c5730c3fe46 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.111",
+      "ip": "172.16.18.111",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-61.grenoble.grid5000.fr",
+      "network_address": "edel-61-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 5cdd9180e0aee748f973c4a888dc6b238a3206f8..13556e2d1221f86043b864819035e508188dea5f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.112",
+      "ip": "172.16.18.112",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-62.grenoble.grid5000.fr",
+      "network_address": "edel-62-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 152b29024030ebde69added8a2c335185f098f59..f39aede0549d507b9d7de35443224cf74551f080 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.113",
+      "ip": "172.16.18.113",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-63.grenoble.grid5000.fr",
+      "network_address": "edel-63-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 20dde280a51fa3d4e3ec9cee951afe483f74ea03..2c74aee118b90e3902dd43dbffe982c94e11e36d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.114",
+      "ip": "172.16.18.114",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-64.grenoble.grid5000.fr",
+      "network_address": "edel-64-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 0587537bd8e5a615f5cd097ef9dfceec6bd3d13c..c706e69b8c970fd58a0eabd804d2df18ee3b29d4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.115",
+      "ip": "172.16.18.115",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-65.grenoble.grid5000.fr",
+      "network_address": "edel-65-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index ed963cbb8b65e9ccc655635955fb0475035bf660..0e395d1b5fde8e2e9076b1774656d58cd9fcea59 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.116",
+      "ip": "172.16.18.116",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-66.grenoble.grid5000.fr",
+      "network_address": "edel-66-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index f134489e200888b811ec537f60a6fb54036cab3c..7a98b6377b81d6963bfaa0275568750cfbe5d5cb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.117",
+      "ip": "172.16.18.117",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-67.grenoble.grid5000.fr",
+      "network_address": "edel-67-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 7791eaff585444f1185cd2373d019208ed5247dd..bb9f6871ef2d7d32e829c19c0ae2e121cd716929 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.118",
+      "ip": "172.16.18.118",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-68.grenoble.grid5000.fr",
+      "network_address": "edel-68-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 832e5fe3373d1a5f08e14d12745efc1dc55301a7..817708865f42509345186bc79e1dc3c96122a96a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.119",
+      "ip": "172.16.18.119",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-69.grenoble.grid5000.fr",
+      "network_address": "edel-69-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index f1c3a090cf6dd623bcb48097a5c8ed594052a095..d0aef574f8dc774e8cc594119298d6f95ef31eb6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.57",
+      "ip": "172.16.18.57",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-7.grenoble.grid5000.fr",
+      "network_address": "edel-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index c0db11360f7fdbeb9b605490d53791a10c0f92f1..10606b4e28489e5a5bce8acfca181744f54aa766 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.120",
+      "ip": "172.16.18.120",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-70.grenoble.grid5000.fr",
+      "network_address": "edel-70-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 7f4b28b356231177dedc1ce940b8dad7e378ca22..4e5f9fd8135ddf2df127452dba945b087c6933b7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.121",
+      "ip": "172.16.18.121",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-71.grenoble.grid5000.fr",
+      "network_address": "edel-71-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 01279eeb35e4d0260b366073043106b127601e7f..1d12bd7b0683e76e854bdd0f55ef8b3e8d741cfb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.122",
+      "ip": "172.16.18.122",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-72.grenoble.grid5000.fr",
+      "network_address": "edel-72-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 00a61a01d7194076594910136e9acaae0eb3cff7..eff05e1fb24ad3fff3aca3f7fe718828d0f78711 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.58",
+      "ip": "172.16.18.58",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-8.grenoble.grid5000.fr",
+      "network_address": "edel-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index 2be2f109badb177ae3cc4536cb09e9cff46f0921..1683be2c5fb39abdba700d40cb21f1f63fec20e9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.59",
+      "ip": "172.16.18.59",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-9.grenoble.grid5000.fr",
+      "network_address": "edel-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index cfc1e4761cbc37e23df57100d392e354115c5f10..0c155446b93c6c2aab69b3161d9ae3ef45629ff8 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -140,8 +140,8 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
         {
           :interface => 'Ethernet',
@@ -221,8 +221,8 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
         {
           :interface => 'Ethernet',
@@ -287,8 +287,8 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
         {
           :interface => 'Ethernet',