diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index 3e244e13c32f23eee779b80d39dd0c5199dd6513..2a70c032203699e479876b969ba61037e838d96f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.51",
+      "ip": "172.16.0.1",
       "mac": "00:14:22:0c:d9:ec",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.51",
+      "ip": "172.16.3.1",
       "mac": "00:14:22:0c:d9:ed",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56",
       "interface": "InfiniBand",
-      "ip": "192.168.132.1",
+      "ip": "172.18.0.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:d9:ec",
       "interface": "Ethernet",
-      "ip": "172.16.7.51",
+      "ip": "172.17.0.1",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index ec506509f321bd092df8e431390036f63d8fa4e3..c277399a7adbaed378efb5e82551721609cb2e1e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.60",
+      "ip": "172.16.0.10",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.60",
+      "ip": "172.16.3.10",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
-      "ip": "192.168.132.10",
+      "ip": "172.18.0.10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:76",
       "interface": "Ethernet",
-      "ip": "172.16.7.60",
+      "ip": "172.17.0.10",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index 2cace75de52991860d99c8f0abe2fbe53497bb4f..aa17cf7dd22f19a8a2da0107ee48daf89fb5ef63 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.61",
+      "ip": "172.16.0.11",
       "mac": "00:14:22:0c:d9:bc",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.61",
+      "ip": "172.16.3.11",
       "mac": "00:14:22:0c:d9:bd",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a",
       "interface": "InfiniBand",
-      "ip": "192.168.132.11",
+      "ip": "172.18.0.11",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:d9:bc",
       "interface": "Ethernet",
-      "ip": "172.16.7.61",
+      "ip": "172.17.0.11",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index eed4c7cc6194a70a86f5090ffbcb6c2c0ec00c98..6874900e3fcde5dd48aeea7960542a07e98ddd5b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.62",
+      "ip": "172.16.0.12",
       "mac": "00:14:22:0c:da:74",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.62",
+      "ip": "172.16.3.12",
       "mac": "00:14:22:0c:da:75",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e",
       "interface": "InfiniBand",
-      "ip": "192.168.132.12",
+      "ip": "172.18.0.12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:74",
       "interface": "Ethernet",
-      "ip": "172.16.7.62",
+      "ip": "172.17.0.12",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index 81e97ea4a1eb49e038c83d760139d3a7e6685e98..215522fdc984e5a1625cad03dadb24269d99f6c8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.63",
+      "ip": "172.16.0.13",
       "mac": "00:14:22:0c:da:82",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.63",
+      "ip": "172.16.3.13",
       "mac": "00:14:22:0c:da:83",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b",
       "interface": "InfiniBand",
-      "ip": "192.168.132.13",
+      "ip": "172.18.0.13",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:82",
       "interface": "Ethernet",
-      "ip": "172.16.7.63",
+      "ip": "172.17.0.13",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index e114950f9cf3f5dbbc526e225495a4e96aff1eb3..e736fc8b7ad99d32e4cec3cab8b5d2d8b3797ed1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.64",
+      "ip": "172.16.0.14",
       "mac": "00:14:22:0c:da:90",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.64",
+      "ip": "172.16.3.14",
       "mac": "00:14:22:0c:da:91",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52",
       "interface": "InfiniBand",
-      "ip": "192.168.132.14",
+      "ip": "172.18.0.14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:90",
       "interface": "Ethernet",
-      "ip": "172.16.7.64",
+      "ip": "172.17.0.14",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 17edd06a583950a43c3f16b0e0ee4dd95ea90f98..33caf05eaf628424999fa5e0a30a5935bb17bb94 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.65",
+      "ip": "172.16.0.15",
       "mac": "00:14:22:0c:da:c0",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.65",
+      "ip": "172.16.3.15",
       "mac": "00:14:22:0c:da:c1",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41",
       "interface": "InfiniBand",
-      "ip": "192.168.132.15",
+      "ip": "172.18.0.15",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:c0",
       "interface": "Ethernet",
-      "ip": "172.16.7.65",
+      "ip": "172.17.0.15",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 3c54eee8b34f552c36cb2fe0714413d4188e4573..29465c54612c8477546e617ebab1f941c5442702 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.66",
+      "ip": "172.16.0.16",
       "mac": "00:14:22:0c:da:44",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.66",
+      "ip": "172.16.3.16",
       "mac": "00:14:22:0c:da:45",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74",
       "interface": "InfiniBand",
-      "ip": "192.168.132.16",
+      "ip": "172.18.0.16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:44",
       "interface": "Ethernet",
-      "ip": "172.16.7.66",
+      "ip": "172.17.0.16",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 18b1003e808b4379bd79310c4e786c2b1a5464bb..b4f0dcf152aeb33529478113c810668f70b7f0d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.67",
+      "ip": "172.16.0.17",
       "mac": "00:14:22:0c:da:62",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.67",
+      "ip": "172.16.3.17",
       "mac": "00:14:22:0c:da:63",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5",
       "interface": "InfiniBand",
-      "ip": "192.168.132.17",
+      "ip": "172.18.0.17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:62",
       "interface": "Ethernet",
-      "ip": "172.16.7.67",
+      "ip": "172.17.0.17",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index 84131045f07c1dca3fe65729dfb81e0506ee49f2..b974ba51c99aa91d979e588afe91c0d71cfed51c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.68",
+      "ip": "172.16.0.18",
       "mac": "00:14:22:0c:da:a2",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.68",
+      "ip": "172.16.3.18",
       "mac": "00:14:22:0c:da:a3",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09",
       "interface": "InfiniBand",
-      "ip": "192.168.132.18",
+      "ip": "172.18.0.18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:a2",
       "interface": "Ethernet",
-      "ip": "172.16.7.68",
+      "ip": "172.17.0.18",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index f8b680a7b89fb69e2f0b7ad857ac36dba2b7fdf3..d374ebe81a435d01521d63a0be89e3ab5d713e2f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.69",
+      "ip": "172.16.0.19",
       "mac": "00:14:22:0c:b4:00",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.69",
+      "ip": "172.16.3.19",
       "mac": "00:14:22:0c:b4:01",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5",
       "interface": "InfiniBand",
-      "ip": "192.168.132.19",
+      "ip": "172.18.0.19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:b4:00",
       "interface": "Ethernet",
-      "ip": "172.16.7.69",
+      "ip": "172.17.0.19",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index d462a10d5b79147fcd25669c8b547c8160a6dad7..2e9ebd072552560443b2c5dbb060298b0acb5856 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.52",
+      "ip": "172.16.0.2",
       "mac": "00:14:22:0c:da:46",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.52",
+      "ip": "172.16.3.2",
       "mac": "00:14:22:0c:da:47",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25",
       "interface": "InfiniBand",
-      "ip": "192.168.132.2",
+      "ip": "172.18.0.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:46",
       "interface": "Ethernet",
-      "ip": "172.16.7.52",
+      "ip": "172.17.0.2",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index 8145583a3af8ed274ba4a684eda31919cb5961a7..bbaf9ee98cade2068487fc02d84f6df28d01dd80 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.70",
+      "ip": "172.16.0.20",
       "mac": "00:14:22:0c:b3:1c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.70",
+      "ip": "172.16.3.20",
       "mac": "00:14:22:0c:b3:1d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9",
       "interface": "InfiniBand",
-      "ip": "192.168.132.20",
+      "ip": "172.18.0.20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:b3:1c",
       "interface": "Ethernet",
-      "ip": "172.16.7.70",
+      "ip": "172.17.0.20",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index da5e8326a5bc512131fd8e60488111d09e728e1e..6746734562c2d44a0a99f3a1081bbaa633463fd7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.71",
+      "ip": "172.16.0.21",
       "mac": "00:14:22:0c:e1:48",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.71",
+      "ip": "172.16.3.21",
       "mac": "00:14:22:0c:e1:49",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a",
       "interface": "InfiniBand",
-      "ip": "192.168.132.21",
+      "ip": "172.18.0.21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:48",
       "interface": "Ethernet",
-      "ip": "172.16.7.71",
+      "ip": "172.17.0.21",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index a89f8860a19eae08cc216f85c52d4fad9cc21369..dec393078ca8f771290f77ca7efc8b602db340ca 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.72",
+      "ip": "172.16.0.22",
       "mac": "00:14:22:0c:dd:02",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.72",
+      "ip": "172.16.3.22",
       "mac": "00:14:22:0c:dd:03",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42",
       "interface": "InfiniBand",
-      "ip": "192.168.132.22",
+      "ip": "172.18.0.22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:dd:02",
       "interface": "Ethernet",
-      "ip": "172.16.7.72",
+      "ip": "172.17.0.22",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index a1da010c06eafb2d17f8e3ebf2c7b11e99e17a79..523e055f05a3be9a8280d7d5ff860a3f37f8fb65 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.73",
+      "ip": "172.16.0.23",
       "mac": "00:14:22:0c:e1:4c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.73",
+      "ip": "172.16.3.23",
       "mac": "00:14:22:0c:e1:4d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89",
       "interface": "InfiniBand",
-      "ip": "192.168.132.23",
+      "ip": "172.18.0.23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:4c",
       "interface": "Ethernet",
-      "ip": "172.16.7.73",
+      "ip": "172.17.0.23",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index d2dd4d953efcf6fb050a0f93c2eae3d4739dd3da..8d58f1ccc0237abeb5c9980d0f93e08cad3a873f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.74",
+      "ip": "172.16.0.24",
       "mac": "00:14:22:0c:e0:e0",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.74",
+      "ip": "172.16.3.24",
       "mac": "00:14:22:0c:e0:e1",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed",
       "interface": "InfiniBand",
-      "ip": "192.168.132.24",
+      "ip": "172.18.0.24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e0:e0",
       "interface": "Ethernet",
-      "ip": "172.16.7.74",
+      "ip": "172.17.0.24",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index a88b3ad246f8d14a636b3f39c7cc93b8599854e2..a4b553be4ef32c1475e095962152e3a0be7be3ac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.75",
+      "ip": "172.16.0.25",
       "mac": "00:14:22:0c:e1:76",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.75",
+      "ip": "172.16.3.25",
       "mac": "00:14:22:0c:e1:77",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b",
       "interface": "InfiniBand",
-      "ip": "192.168.132.25",
+      "ip": "172.18.0.25",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:76",
       "interface": "Ethernet",
-      "ip": "172.16.7.75",
+      "ip": "172.17.0.25",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index 58c1e4d52b4c4643a31dd7db4981198412330e24..f5597b12413d03bf6e8f2a38f9fee880397d18f3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.76",
+      "ip": "172.16.0.26",
       "mac": "00:14:22:0c:e1:52",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.76",
+      "ip": "172.16.3.26",
       "mac": "00:14:22:0c:e1:53",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95",
       "interface": "InfiniBand",
-      "ip": "192.168.132.26",
+      "ip": "172.18.0.26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:52",
       "interface": "Ethernet",
-      "ip": "172.16.7.76",
+      "ip": "172.17.0.26",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index f596c9c5ac0e5007fadf10aa83cd28a99f0b4b9b..e6c137dcbf3a1a5879dd100cdcc55424af055665 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.77",
+      "ip": "172.16.0.27",
       "mac": "00:14:22:0c:e1:7e",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.77",
+      "ip": "172.16.3.27",
       "mac": "00:14:22:0c:e1:7f",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56",
       "interface": "InfiniBand",
-      "ip": "192.168.132.27",
+      "ip": "172.18.0.27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:7e",
       "interface": "Ethernet",
-      "ip": "172.16.7.77",
+      "ip": "172.17.0.27",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index df03ca2c368a0445dbf3e3b89cfa956ca3e045a4..39925f7547e039c68aaa3091a148563ececec5b0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.78",
+      "ip": "172.16.0.28",
       "mac": "00:14:22:0c:e1:8c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.78",
+      "ip": "172.16.3.28",
       "mac": "00:14:22:0c:e1:8d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99",
       "interface": "InfiniBand",
-      "ip": "192.168.132.28",
+      "ip": "172.18.0.28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:8c",
       "interface": "Ethernet",
-      "ip": "172.16.7.78",
+      "ip": "172.17.0.28",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index f51b071f36b0d4719eb15a59fe5b170e387d39cd..81487ad63733acb3d0695f67e11d731b019f7b06 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.79",
+      "ip": "172.16.0.29",
       "mac": "00:14:22:0c:e1:0a",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.79",
+      "ip": "172.16.3.29",
       "mac": "00:14:22:0c:e1:0b",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a",
       "interface": "InfiniBand",
-      "ip": "192.168.132.29",
+      "ip": "172.18.0.29",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:0a",
       "interface": "Ethernet",
-      "ip": "172.16.7.79",
+      "ip": "172.17.0.29",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index a258799c41eb33ef89af71d24ccf7e20e668d03d..3ecfb174a4a570ba2fb90fc844c4a483c8e803a5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.53",
+      "ip": "172.16.0.3",
       "mac": "00:14:22:0c:e1:66",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.53",
+      "ip": "172.16.3.3",
       "mac": "00:14:22:0c:e1:67",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72",
       "interface": "InfiniBand",
-      "ip": "192.168.132.3",
+      "ip": "172.18.0.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:66",
       "interface": "Ethernet",
-      "ip": "172.16.7.53",
+      "ip": "172.17.0.3",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index e38886e3df5660ae87135e1dee589eac4199d447..cbb4cb8e384ab72d324ab91a668285204596a371 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.80",
+      "ip": "172.16.0.30",
       "mac": "00:14:22:0c:e1:92",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.80",
+      "ip": "172.16.3.30",
       "mac": "00:14:22:0c:e1:93",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd",
       "interface": "InfiniBand",
-      "ip": "192.168.132.30",
+      "ip": "172.18.0.30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:92",
       "interface": "Ethernet",
-      "ip": "172.16.7.80",
+      "ip": "172.17.0.30",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index 5e33a1b9ee829955ecf97cc6994f11d6e9683126..a9b61da2e610a3cbd4a3c47494e46ada2e6ce367 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.81",
+      "ip": "172.16.0.31",
       "mac": "00:14:22:0c:e1:ba",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.81",
+      "ip": "172.16.3.31",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
-      "ip": "192.168.132.31",
+      "ip": "172.18.0.31",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:ba",
       "interface": "Ethernet",
-      "ip": "172.16.7.81",
+      "ip": "172.17.0.31",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 159dc2a0b49c4f29a50b5e041ef5ed3520366c8a..e52e328318ed7f0745269b948baf6955494f4702 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.82",
+      "ip": "172.16.0.32",
       "mac": "00:14:22:0c:da:b6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.82",
+      "ip": "172.16.3.32",
       "mac": "00:14:22:0c:da:b7",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98",
       "interface": "InfiniBand",
-      "ip": "192.168.132.32",
+      "ip": "172.18.0.32",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:b6",
       "interface": "Ethernet",
-      "ip": "172.16.7.82",
+      "ip": "172.17.0.32",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index 342f38a891871be7e7a27e362a1825e36f8a2cab..5ef46cd6d07381bd5c4a14fe270497dfbf206732 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.83",
+      "ip": "172.16.0.33",
       "mac": "00:14:22:0c:da:94",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.83",
+      "ip": "172.16.3.33",
       "mac": "00:14:22:0c:da:95",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
       "interface": "InfiniBand",
-      "ip": "192.168.132.33",
+      "ip": "172.18.0.33",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:94",
       "interface": "Ethernet",
-      "ip": "172.16.7.83",
+      "ip": "172.17.0.33",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 0faaed7614964ebb78421d66dddf19e88cc411df..420899c74b93421d50a4a7a80dd57450b2b83e95 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.84",
+      "ip": "172.16.0.34",
       "mac": "00:14:22:0c:da:12",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.84",
+      "ip": "172.16.3.34",
       "mac": "00:14:22:0c:da:13",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69",
       "interface": "InfiniBand",
-      "ip": "192.168.132.34",
+      "ip": "172.18.0.34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:12",
       "interface": "Ethernet",
-      "ip": "172.16.7.84",
+      "ip": "172.17.0.34",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index 2844396caa250f1aa3af34f01770d3ad32101bf0..2f0af583b355b5230943dfb45d81ff2b1a57b4bb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.85",
+      "ip": "172.16.0.35",
       "mac": "00:14:22:0c:e1:36",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.85",
+      "ip": "172.16.3.35",
       "mac": "00:14:22:0c:e1:37",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37",
       "interface": "InfiniBand",
-      "ip": "192.168.132.35",
+      "ip": "172.18.0.35",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:36",
       "interface": "Ethernet",
-      "ip": "172.16.7.85",
+      "ip": "172.17.0.35",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index 94920406cb53b2d55dae770767ab14767c73be55..423db6d1013559e40446bb24ced5689342b26587 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.86",
+      "ip": "172.16.0.36",
       "mac": "00:14:22:0c:e1:6a",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.86",
+      "ip": "172.16.3.36",
       "mac": "00:14:22:0c:e1:6b",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22",
       "interface": "InfiniBand",
-      "ip": "192.168.132.36",
+      "ip": "172.18.0.36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:6a",
       "interface": "Ethernet",
-      "ip": "172.16.7.86",
+      "ip": "172.17.0.36",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index ed23c50ac91d817f4bb91cfb0211dcad196b1458..d8c85e71dd9687479104c7b9b6af59bd843af8ff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.87",
+      "ip": "172.16.0.37",
       "mac": "00:14:22:0c:b1:7a",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.87",
+      "ip": "172.16.3.37",
       "mac": "00:14:22:0c:b1:7b",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1",
       "interface": "InfiniBand",
-      "ip": "192.168.132.37",
+      "ip": "172.18.0.37",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:b1:7a",
       "interface": "Ethernet",
-      "ip": "172.16.7.87",
+      "ip": "172.17.0.37",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index f42a9c9ea9ea35989219c600efb8c636f662dbac..5c953744703e0217eed329e4a948353e6931c4c8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.88",
+      "ip": "172.16.0.38",
       "mac": "00:13:72:69:a8:b6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.88",
+      "ip": "172.16.3.38",
       "mac": "00:13:72:69:a8:b7",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1",
       "interface": "InfiniBand",
-      "ip": "192.168.132.38",
+      "ip": "172.18.0.38",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:13:72:69:a8:b6",
       "interface": "Ethernet",
-      "ip": "172.16.7.88",
+      "ip": "172.17.0.38",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 026ceebfe1a623154d848d1370bbf8c60797078c..3e0cdc6543887bb7cb959895cd45db977ea672a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.89",
+      "ip": "172.16.0.39",
       "mac": "00:14:22:0c:da:7c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.89",
+      "ip": "172.16.3.39",
       "mac": "00:14:22:0c:da:7d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05",
       "interface": "InfiniBand",
-      "ip": "192.168.132.39",
+      "ip": "172.18.0.39",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:7c",
       "interface": "Ethernet",
-      "ip": "172.16.7.89",
+      "ip": "172.17.0.39",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index 7359a5257afc162b9207fe50576d23841919c431..c2bb283d0845d5bec356f0cb677b22bdb1e95789 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.54",
+      "ip": "172.16.0.4",
       "mac": "00:14:22:0c:d9:fa",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.54",
+      "ip": "172.16.3.4",
       "mac": "00:14:22:0c:d9:fb",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9",
       "interface": "InfiniBand",
-      "ip": "192.168.132.4",
+      "ip": "172.18.0.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:d9:fa",
       "interface": "Ethernet",
-      "ip": "172.16.7.54",
+      "ip": "172.17.0.4",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index fc0af83f45f27e396351748ab3e0c4f92891a572..79f77dce9bd9b92094540097763c388a3068688f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.90",
+      "ip": "172.16.0.40",
       "mac": "00:13:72:69:86:4c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.90",
+      "ip": "172.16.3.40",
       "mac": "00:13:72:69:86:4d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f",
       "interface": "InfiniBand",
-      "ip": "192.168.132.40",
+      "ip": "172.18.0.40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:13:72:69:86:4c",
       "interface": "Ethernet",
-      "ip": "172.16.7.90",
+      "ip": "172.17.0.40",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index f7df3df17ce06440dbcb0ddba167531569aa08e2..ad5bf7692a58513fd55b242f70698b1cf6432d2a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.91",
+      "ip": "172.16.0.41",
       "mac": "00:14:22:0c:b3:92",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.91",
+      "ip": "172.16.3.41",
       "mac": "00:14:22:0c:b3:93",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e",
       "interface": "InfiniBand",
-      "ip": "192.168.132.41",
+      "ip": "172.18.0.41",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:b3:92",
       "interface": "Ethernet",
-      "ip": "172.16.7.91",
+      "ip": "172.17.0.41",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 1a7129f724a4261773e628136c9828a6683382b2..86eb2cf9786abb6acefddd722ab77866d1dbeeb6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.92",
+      "ip": "172.16.0.42",
       "mac": "00:14:22:0c:e1:a4",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.92",
+      "ip": "172.16.3.42",
       "mac": "00:14:22:0c:e1:a5",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81",
       "interface": "InfiniBand",
-      "ip": "192.168.132.42",
+      "ip": "172.18.0.42",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:a4",
       "interface": "Ethernet",
-      "ip": "172.16.7.92",
+      "ip": "172.17.0.42",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index 6d4c8a0bc72cf2456890f02b3a17484c3d363c4a..410ecaf183b71ba594cac503f3b34917c387c730 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.93",
+      "ip": "172.16.0.43",
       "mac": "00:14:22:0c:da:8c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.93",
+      "ip": "172.16.3.43",
       "mac": "00:14:22:0c:da:8d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75",
       "interface": "InfiniBand",
-      "ip": "192.168.132.43",
+      "ip": "172.18.0.43",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:8c",
       "interface": "Ethernet",
-      "ip": "172.16.7.93",
+      "ip": "172.17.0.43",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index 5de91827762f8570383a6db837af344a49255ded..1f02965053b540065aa8035b9b45bffbdca41c46 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.94",
+      "ip": "172.16.0.44",
       "mac": "00:14:22:0c:b1:1c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.94",
+      "ip": "172.16.3.44",
       "mac": "00:14:22:0c:b1:1d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92",
       "interface": "InfiniBand",
-      "ip": "192.168.132.44",
+      "ip": "172.18.0.44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:b1:1c",
       "interface": "Ethernet",
-      "ip": "172.16.7.94",
+      "ip": "172.17.0.44",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 14733ca4c494d35a3bf8d693c09428a92146e89c..11edbb059da1ea8c722d7d7a7d63264f4b234be5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.95",
+      "ip": "172.16.0.45",
       "mac": "00:14:22:0c:da:88",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.95",
+      "ip": "172.16.3.45",
       "mac": "00:14:22:0c:da:89",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89",
       "interface": "InfiniBand",
-      "ip": "192.168.132.45",
+      "ip": "172.18.0.45",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:88",
       "interface": "Ethernet",
-      "ip": "172.16.7.95",
+      "ip": "172.17.0.45",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 86809c208c3516e5ae741c773537b2d80ea1edd2..4fe5345905695f88146388a5c210f2b922643408 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.96",
+      "ip": "172.16.0.46",
       "mac": "00:14:22:0c:e1:7c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.96",
+      "ip": "172.16.3.46",
       "mac": "00:14:22:0c:e1:7d",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62",
       "interface": "InfiniBand",
-      "ip": "192.168.132.46",
+      "ip": "172.18.0.46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:7c",
       "interface": "Ethernet",
-      "ip": "172.16.7.96",
+      "ip": "172.17.0.46",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index e30c4cb23b7e62be8c56eaa136a2da4eb469635c..2c026c2c1fc1dbdbdcf3ded56def4ea194c7af3f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.97",
+      "ip": "172.16.0.47",
       "mac": "00:14:22:0c:de:34",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.97",
+      "ip": "172.16.3.47",
       "mac": "00:14:22:0c:de:35",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c",
       "interface": "InfiniBand",
-      "ip": "192.168.132.47",
+      "ip": "172.18.0.47",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:de:34",
       "interface": "Ethernet",
-      "ip": "172.16.7.97",
+      "ip": "172.17.0.47",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index e0f695ac4ee348d565a00c4cffbf95cd3b218b98..017a103032d15445c9ba1fa68842c5f12143ee8d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.98",
+      "ip": "172.16.0.48",
       "mac": "00:14:22:0c:db:ca",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.98",
+      "ip": "172.16.3.48",
       "mac": "00:14:22:0c:db:cb",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59",
       "interface": "InfiniBand",
-      "ip": "192.168.132.48",
+      "ip": "172.18.0.48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:db:ca",
       "interface": "Ethernet",
-      "ip": "172.16.7.98",
+      "ip": "172.17.0.48",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index acee3d863f0d444e802eef2b4fec411915253a27..a67420f2a1f299522884c3797340f820dc797452 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.99",
+      "ip": "172.16.0.49",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.99",
+      "ip": "172.16.3.49",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
-      "ip": "192.168.132.49",
+      "ip": "172.18.0.49",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": null,
       "interface": "Ethernet",
-      "ip": "172.16.7.99",
+      "ip": "172.17.0.49",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index 4e8399b41decf34bd1259927e35eddd0e9d719b1..3253feb966083f306b94537f7fd62d5328b7540b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.55",
+      "ip": "172.16.0.5",
       "mac": "00:14:22:0c:e1:74",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.55",
+      "ip": "172.16.3.5",
       "mac": "00:14:22:0c:e1:75",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5",
       "interface": "InfiniBand",
-      "ip": "192.168.132.5",
+      "ip": "172.18.0.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:74",
       "interface": "Ethernet",
-      "ip": "172.16.7.55",
+      "ip": "172.17.0.5",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 9ea307b4bd67a5f58977a9a1c3e9955c1b97c438..d82b7fcf3a7b2c33131a632ffaada91dc0e2d8d1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.100",
+      "ip": "172.16.0.50",
       "mac": "00:14:22:0c:da:a6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.100",
+      "ip": "172.16.3.50",
       "mac": "00:14:22:0c:da:a7",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32",
       "interface": "InfiniBand",
-      "ip": "192.168.132.50",
+      "ip": "172.18.0.50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:a6",
       "interface": "Ethernet",
-      "ip": "172.16.7.100",
+      "ip": "172.17.0.50",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index ee1ca59634b2abc9c481c0a9aef4261efdac3dad..1cb34916dfdff49a568fb0324527b128dda342a9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.101",
+      "ip": "172.16.0.51",
       "mac": "00:14:22:0c:da:7e",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.101",
+      "ip": "172.16.3.51",
       "mac": "00:14:22:0c:da:7f",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03",
       "interface": "InfiniBand",
-      "ip": "192.168.132.51",
+      "ip": "172.18.0.51",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:7e",
       "interface": "Ethernet",
-      "ip": "172.16.7.101",
+      "ip": "172.17.0.51",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index b3534412f5a8d432df855a1125163037625d157b..7e3a82703b8ea1bf58609aa89701dd1bb94c7283 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.56",
+      "ip": "172.16.0.6",
       "mac": "00:14:22:0c:da:6e",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.56",
+      "ip": "172.16.3.6",
       "mac": "00:14:22:0c:da:6f",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39",
       "interface": "InfiniBand",
-      "ip": "192.168.132.6",
+      "ip": "172.18.0.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:6e",
       "interface": "Ethernet",
-      "ip": "172.16.7.56",
+      "ip": "172.17.0.6",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 876906e6d0150d69a89d329205299313bbd6558c..323034e82d6c234fb1819715d4d35654abd8b9d5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.57",
+      "ip": "172.16.0.7",
       "mac": "00:14:22:0c:e1:44",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.57",
+      "ip": "172.16.3.7",
       "mac": "00:14:22:0c:e1:45",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e",
       "interface": "InfiniBand",
-      "ip": "192.168.132.7",
+      "ip": "172.18.0.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:e1:44",
       "interface": "Ethernet",
-      "ip": "172.16.7.57",
+      "ip": "172.17.0.7",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index 6717e5ad0c772a74b78e5573c355559acd889bd8..9418b0e80e32d2332fafd122cbb305ac12e5479d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.58",
+      "ip": "172.16.0.8",
       "mac": "00:14:22:0c:da:40",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.58",
+      "ip": "172.16.3.8",
       "mac": "00:14:22:0c:da:41",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
-      "ip": "192.168.132.8",
+      "ip": "172.18.0.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:40",
       "interface": "Ethernet",
-      "ip": "172.16.7.58",
+      "ip": "172.17.0.8",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index 73b4b2a30f45942b59ead8089c7295a30fad497b..0b9762cc865fd4af6f9b0ae269eab41e2d5f6bfc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -23,7 +23,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.59",
+      "ip": "172.16.0.9",
       "mac": "00:14:22:0c:da:50",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.59",
+      "ip": "172.16.3.9",
       "mac": "00:14:22:0c:da:51",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
-      "ip": "192.168.132.9",
+      "ip": "172.18.0.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "enabled": true,
       "guid": "00:14:22:0c:da:50",
       "interface": "Ethernet",
-      "ip": "172.16.7.59",
+      "ip": "172.17.0.9",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 1903c00420fcd795cebfb7532819f70effd007c4..296f5d749a34047b136c3daa707a9aaa59dfa245 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.102",
+      "ip": "172.16.1.1",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.102",
+      "ip": "172.16.4.1",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.103",
+      "ip": "172.17.4.1",
       "mac": null,
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 69766cd8f1df3a98bd962925cb6a4bd3cc505bdd..d154d3f38b52cea340da22b2ade90db7f883ca8a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.111",
+      "ip": "172.16.1.10",
       "mac": "00:14:5e:55:6b:ca",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.111",
+      "ip": "172.16.4.10",
       "mac": "00:14:5e:55:6b:cb",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.112",
+      "ip": "172.17.4.10",
       "mac": "00:14:5e:55:6b:cc",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 562390ff0d065c4c68c5fc0c7a0fe2369089ea6a..919566fd8100ef8321d1c0eb94ed96fd36adf951 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.112",
+      "ip": "172.16.1.11",
       "mac": "00:14:5e:55:5c:81",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.112",
+      "ip": "172.16.4.11",
       "mac": "00:14:5e:55:5c:82",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.113",
+      "ip": "172.17.4.11",
       "mac": "00:14:5e:55:5c:83",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index 6918bfef1883a8105ef38138dd8ecc44f3b60f25..22131abd8d9e36d15cdfd256f2129e871ed7bd20 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.113",
+      "ip": "172.16.1.12",
       "mac": "00:14:5e:55:58:f7",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.113",
+      "ip": "172.16.4.12",
       "mac": "00:14:5e:55:58:f8",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.114",
+      "ip": "172.17.4.12",
       "mac": "00:14:5e:55:58:f9",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index 4dba4a284ec8669b1fe050e2d95f4ff4aeed2f45..be70083b79f8d9227fc2dcf3ea0a2cecb2084489 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.114",
+      "ip": "172.16.1.13",
       "mac": "00:14:5e:55:59:63",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.114",
+      "ip": "172.16.4.13",
       "mac": "00:14:5e:55:59:64",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.115",
+      "ip": "172.17.4.13",
       "mac": "00:14:5e:55:59:65",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index 3bbdaeb2fc090ebfc35f7013bffa68815b3b61e0..c5b1373dd28441382fe70657d1e41b7664a8bca7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.115",
+      "ip": "172.16.1.14",
       "mac": "00:14:5e:55:59:5d",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.115",
+      "ip": "172.16.4.14",
       "mac": "00:14:5e:55:59:5e",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.116",
+      "ip": "172.17.4.14",
       "mac": "00:14:5e:55:59:5f",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index e08df1a2a8df28b398c132823e59b063390594e1..3890451cc56cff67541274ff189ab5458c9b8082 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.116",
+      "ip": "172.16.1.15",
       "mac": "00:14:5e:55:6a:f2",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.116",
+      "ip": "172.16.4.15",
       "mac": "00:14:5e:55:6a:f3",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.117",
+      "ip": "172.17.4.15",
       "mac": "00:14:5e:55:6a:f4",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index c570b7bb66e345f64b619861e56b265f47a8721b..eb29f960fe967b6a68466f42cb2387d3d96401de 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.117",
+      "ip": "172.16.1.16",
       "mac": "00:14:5e:55:5d:ec",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.117",
+      "ip": "172.16.4.16",
       "mac": "00:14:5e:55:5d:ed",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.118",
+      "ip": "172.17.4.16",
       "mac": "00:14:5e:55:5d:ee",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index 1639a9ca46bfbe9346d3cf9f4fdbdfcab21c27e4..dd59bbda914d3da1d935ee8ed8c76049f38b1850 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.118",
+      "ip": "172.16.1.17",
       "mac": "00:14:5e:55:5e:a9",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.118",
+      "ip": "172.16.4.17",
       "mac": "00:14:5e:55:5e:aa",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.119",
+      "ip": "172.17.4.17",
       "mac": "00:14:5e:55:5e:ab",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index 69b7cd88a2e0b7297df05e400f9f64dcccc4b6a9..8ab1535eb35413730edddfdd07116541a29d3ec7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.119",
+      "ip": "172.16.1.18",
       "mac": "00:14:5e:55:64:0d",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.119",
+      "ip": "172.16.4.18",
       "mac": "00:14:5e:55:64:0e",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.120",
+      "ip": "172.17.4.18",
       "mac": "00:14:5e:55:64:0f",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index 063dfed2df67a2e4f7ecd6217723bfc9fcbf6e4e..6963b22a220e0e18021b30df90cd14ad4af08a74 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.120",
+      "ip": "172.16.1.19",
       "mac": "00:14:5e:55:68:67",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.120",
+      "ip": "172.16.4.19",
       "mac": "00:14:5e:55:68:68",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.121",
+      "ip": "172.17.4.19",
       "mac": "00:14:5e:55:68:69",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index 70ca3e69e4801262a2613fd4caa0c3581b88f3c4..7374c58733b3d46a431733d65469eb988a509523 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.103",
+      "ip": "172.16.1.2",
       "mac": "00:14:5e:55:5d:2c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.103",
+      "ip": "172.16.4.2",
       "mac": "00:14:5e:55:5d:2d",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.104",
+      "ip": "172.17.4.2",
       "mac": "00:14:5e:55:5d:2e",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index 670ac63e959bd757f26b4a7bee2122a68c3c652c..023c4de4719125bea18356e2b19365bd85a9da12 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.121",
+      "ip": "172.16.1.20",
       "mac": "00:14:5e:55:62:b1",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.121",
+      "ip": "172.16.4.20",
       "mac": "00:14:5e:55:62:b2",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.122",
+      "ip": "172.17.4.20",
       "mac": "00:14:5e:55:62:b3",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index 8a2042962b998c2ace034e4853201240e5e454d4..09adff41d546870a09792582083bdfe455b49e63 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.122",
+      "ip": "172.16.1.21",
       "mac": "00:14:5e:55:5a:98",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.122",
+      "ip": "172.16.4.21",
       "mac": "00:14:5e:55:5a:99",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.123",
+      "ip": "172.17.4.21",
       "mac": "00:14:5e:55:5a:9a",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index dc42125bb42c5c33a767c12dec414c53d8ddfdf7..25d0c596c79e472893ea32ad519fbf2dd0cd0210 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.123",
+      "ip": "172.16.1.22",
       "mac": "00:14:5e:55:59:84",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.123",
+      "ip": "172.16.4.22",
       "mac": "00:14:5e:55:59:85",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.124",
+      "ip": "172.17.4.22",
       "mac": "00:14:5e:55:59:86",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 0b9b5aaf10399057ba1976fbf8adf5cbcf1f3a92..315022ec2ee51693a0b5810531b7d10b1f67e54c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.124",
+      "ip": "172.16.1.23",
       "mac": "00:14:5e:55:62:96",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.124",
+      "ip": "172.16.4.23",
       "mac": "00:14:5e:55:62:97",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.125",
+      "ip": "172.17.4.23",
       "mac": "00:14:5e:55:62:98",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index 6d261f78826471676472d98434c57ea39689d012..9daab69c05980ae701afa667a77e0132e722193e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.125",
+      "ip": "172.16.1.24",
       "mac": "00:14:5e:55:5d:da",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.125",
+      "ip": "172.16.4.24",
       "mac": "00:14:5e:55:5d:db",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.126",
+      "ip": "172.17.4.24",
       "mac": "00:14:5e:55:5d:dc",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index 9503d61c32c12b4c3edf1d393b033184cb3c76d6..f50a409e322bf516d321eea873144f07e308fd35 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.126",
+      "ip": "172.16.1.25",
       "mac": "00:14:5e:55:5d:b9",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.126",
+      "ip": "172.16.4.25",
       "mac": "00:14:5e:55:5d:ba",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.127",
+      "ip": "172.17.4.25",
       "mac": "00:14:5e:55:5d:bb",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index 83152c7173b22eaa3fc9a040d6b93fcc74704da1..6951ed20093fc9b8b38e98fe3096e2a9a9cdb4cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.127",
+      "ip": "172.16.1.26",
       "mac": "00:14:5e:55:6d:2f",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.127",
+      "ip": "172.16.4.26",
       "mac": "00:14:5e:55:6d:30",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.128",
+      "ip": "172.17.4.26",
       "mac": "00:14:5e:55:6d:31",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index 173308d2297fc9a37ce164c48e5e0b86307d388b..3403ec9b0aaabe6c697e63e5fd8347f7b19e1605 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.128",
+      "ip": "172.16.1.27",
       "mac": "00:14:5e:55:5c:69",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.128",
+      "ip": "172.16.4.27",
       "mac": "00:14:5e:55:5c:6a",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.129",
+      "ip": "172.17.4.27",
       "mac": "00:14:5e:55:5d:6b",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index e59da533e91dc0288fd4897ca33aedaf53fdd238..615b8a319660c421c7ee11b9bf974e566fced9f3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.129",
+      "ip": "172.16.1.28",
       "mac": "00:14:5e:55:5e:88",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.129",
+      "ip": "172.16.4.28",
       "mac": "00:14:5e:55:5e:89",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.130",
+      "ip": "172.17.4.28",
       "mac": "00:14:5e:55:5e:8a",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index b224b9f027afa6989c6d0f49b5f292b55a877ec3..09a13829146edc3d113c8e04e99ed7ec042d0e4b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.130",
+      "ip": "172.16.1.29",
       "mac": "00:14:5e:55:5c:c3",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.130",
+      "ip": "172.16.4.29",
       "mac": "00:14:5e:55:5c:c4",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.131",
+      "ip": "172.17.4.29",
       "mac": "00:14:5e:55:5c:c5",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index f378dfb1e4d5405d8ef550aea07d9b16999f2e34..077a5283fcd95c2da64565946019cb2503e13192 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.104",
+      "ip": "172.16.1.3",
       "mac": "00:14:5e:55:5c:42",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.104",
+      "ip": "172.16.4.3",
       "mac": "00:14:5e:55:5c:43",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.105",
+      "ip": "172.17.4.3",
       "mac": "00:14:5e:55:5c:44",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index cf71be2b770ecd5df28302151ac7a191d94b5ca9..a599584b507b79cc042c70cc0d7741636846931c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.131",
+      "ip": "172.16.1.30",
       "mac": "00:14:5e:55:5e:d6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.131",
+      "ip": "172.16.4.30",
       "mac": "00:14:5e:55:5e:d7",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.132",
+      "ip": "172.17.4.30",
       "mac": "00:14:5e:55:5e:d8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index fe7bf332a99e1937cc62890fe810f7e7d50bc7cb..39f7d34a6e12fa1520b791295cc19ec0d43daef1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.132",
+      "ip": "172.16.1.31",
       "mac": "00:14:5e:55:59:b7",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.132",
+      "ip": "172.16.4.31",
       "mac": "00:14:5e:55:59:b8",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.133",
+      "ip": "172.17.4.31",
       "mac": "00:14:5e:55:59:b9",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index f53a81c872becd841cd8f46d6b74af39a96df43d..ccf982bfee94d9230bf3f97a7c509f094058aae4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.133",
+      "ip": "172.16.1.32",
       "mac": "00:14:5e:55:59:bd",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.133",
+      "ip": "172.16.4.32",
       "mac": "00:14:5e:55:59:be",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.134",
+      "ip": "172.17.4.32",
       "mac": "00:14:5e:55:59:bf",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index 82061a1dca11430043d2c8c0a3745f125b07d4c0..00859b056bf16f6c654c5e14b6d83f8dd25274b2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.134",
+      "ip": "172.16.1.33",
       "mac": "00:14:5e:55:5e:b2",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.134",
+      "ip": "172.16.4.33",
       "mac": "00:14:5e:55:5e:b3",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.135",
+      "ip": "172.17.4.33",
       "mac": "00:14:5e:55:5e:b4",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 3a76579e0948f73199c683f84f9cba0544596107..f904e235bda3fb040b04778f8db5b8e4bd1bef0a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.135",
+      "ip": "172.16.1.34",
       "mac": "00:14:5e:55:5d:02",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.135",
+      "ip": "172.16.4.34",
       "mac": "00:14:5e:55:5d:03",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.136",
+      "ip": "172.17.4.34",
       "mac": "00:14:5e:55:5d:04",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index 0c6fdcd883f5b99f6b1fe0bfc07a20f06145d0a5..915936273dd76c0880d5e4418aa20147674cf3fa 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.136",
+      "ip": "172.16.1.35",
       "mac": "00:14:5e:55:5e:22",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.136",
+      "ip": "172.16.4.35",
       "mac": "00:14:5e:55:5e:23",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.137",
+      "ip": "172.17.4.35",
       "mac": "00:14:5e:55:5e:24",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 0b49324f6c81e96f8477271ed2a8eba7befc3986..7e60a3993ef33f4d0f1b8b72dc7a295d4d6f427d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.137",
+      "ip": "172.16.1.36",
       "mac": "00:14:5e:55:69:f0",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.137",
+      "ip": "172.16.4.36",
       "mac": "00:14:5e:55:69:f1",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.138",
+      "ip": "172.17.4.36",
       "mac": "00:14:5e:55:69:f2",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index ae0b83aaea7d496a49ecb0101b66980897f86d27..09adc91e4fc06bf065d62d0e80810566a9740ab4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.138",
+      "ip": "172.16.1.37",
       "mac": "00:14:5e:55:5f:d2",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.138",
+      "ip": "172.16.4.37",
       "mac": "00:14:5e:55:5f:d3",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.139",
+      "ip": "172.17.4.37",
       "mac": "00:14:5e:55:5f:d4",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index de8cbbf9cd674d3fb02e3a242b528d30270ef2b9..28a32bc1f0cd17d3112032bfdd18add6971a34e4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.139",
+      "ip": "172.16.1.38",
       "mac": "00:14:5e:55:5f:0f",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.139",
+      "ip": "172.16.4.38",
       "mac": "00:14:5e:55:5f:10",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.140",
+      "ip": "172.17.4.38",
       "mac": "00:14:5e:55:5f:11",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index ed4a10022361e6fc662bfd9cd3a30934749d0a82..75a06dc37dc1b3a877f9d5852dd25235f5ba7b1e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.140",
+      "ip": "172.16.1.39",
       "mac": "00:14:5e:55:63:2f",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.140",
+      "ip": "172.16.4.39",
       "mac": "00:14:5e:55:63:30",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.141",
+      "ip": "172.17.4.39",
       "mac": "00:14:5e:55:63:31",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index f470c2ee8fd111b961a9c208e40e8c9cecb088e9..f10e871d18e0a252713791f5a82796b6a66b79c2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.105",
+      "ip": "172.16.1.4",
       "mac": "00:14:5e:55:68:c7",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.105",
+      "ip": "172.16.4.4",
       "mac": "00:14:5e:55:68:c8",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.106",
+      "ip": "172.17.4.4",
       "mac": "00:14:5E:55:68:C9",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index be9e4e5a3174a4ef5560c887ad393501c81e7697..a3bc5a2f411d64045b9ff081f1a2639616f9f6ef 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.141",
+      "ip": "172.16.1.40",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.141",
+      "ip": "172.16.4.40",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.142",
+      "ip": "172.17.4.40",
       "mac": null,
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index f3adb78873f22ce769407d1790bf272a0dd122a6..e547e678583c6251e5032d8aff9b457911dbf216 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.142",
+      "ip": "172.16.1.41",
       "mac": "00:14:5e:55:59:00",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.142",
+      "ip": "172.16.4.41",
       "mac": "00:14:5e:55:59:01",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.143",
+      "ip": "172.17.4.41",
       "mac": "00:14:5e:55:59:02",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index 860e97f3efbda8e3ccd8be7ffe009a569156f9bc..d113ba6ec884f1625b8d4a5f106ab7090d6afb32 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.143",
+      "ip": "172.16.1.42",
       "mac": "00:14:5e:55:60:95",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.143",
+      "ip": "172.16.4.42",
       "mac": "00:14:5e:55:60:96",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.144",
+      "ip": "172.17.4.42",
       "mac": "00:14:5e:55:60:97",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 967d83c65bd0a7189f3e04c4870b13f79b5885cd..97f67d155f8a3e4aff110b9eec65866006a5e75d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.144",
+      "ip": "172.16.1.43",
       "mac": "00:14:5e:55:6c:00",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.144",
+      "ip": "172.16.4.43",
       "mac": "00:14:5e:55:6c:01",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.145",
+      "ip": "172.17.4.43",
       "mac": "00:14:5e:55:6c:02",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index d86000bf5243617301865ad0d1a736ec4e32e5e3..16fa54ef2adb0d1933218b6a886960eb3eb98186 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.145",
+      "ip": "172.16.1.44",
       "mac": "00:14:5e:55:59:d2",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.145",
+      "ip": "172.16.4.44",
       "mac": "00:14:5e:55:59:d3",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.146",
+      "ip": "172.17.4.44",
       "mac": "00:14:5e:55:59:d4",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 85e98f5fa6be3146419235481557b91a5fc2b44b..cfd791719d14f46b186d256d9d63a4af95ef98da 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.146",
+      "ip": "172.16.1.45",
       "mac": "00:14:5e:55:5c:bd",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.146",
+      "ip": "172.16.4.45",
       "mac": "00:14:5e:55:5c:be",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.147",
+      "ip": "172.17.4.45",
       "mac": "00:14:5e:55:5c:bf",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index cb0901ff6f3907fc417ea366a2f4923352e9d537..1289d240be614bdf5a6ca435571ade7d8a923997 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.147",
+      "ip": "172.16.1.46",
       "mac": "00:14:5e:55:5c:60",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.147",
+      "ip": "172.16.4.46",
       "mac": "00:14:5e:55:5c:61",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.148",
+      "ip": "172.17.4.46",
       "mac": "00:14:5e:55:5c:62",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index 65fc23a336086e29131e594eefaa8dc1948bb602..6fe0e076fbb70522c8e812f253517331408dd470 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.148",
+      "ip": "172.16.1.47",
       "mac": "00:14:5e:55:6c:a8",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.148",
+      "ip": "172.16.4.47",
       "mac": "00:14:5e:55:6c:a9",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.149",
+      "ip": "172.17.4.47",
       "mac": "00:14:5e:55:6c:aa",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 6872c446f404b98d61f2b337619ed90ee2375879..03a215f25bc1b582287498e480fc31dcd69ae44a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.149",
+      "ip": "172.16.1.48",
       "mac": "00:14:5e:55:58:fd",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.149",
+      "ip": "172.16.4.48",
       "mac": "00:14:5e:55:58:fe",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.150",
+      "ip": "172.17.4.48",
       "mac": "00:14:5e:55:58:ff",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index 185e164c5ea3dfc78a0c581afdadcb2e51c56c2a..8ae73622ef250f21078d4b3c1d2bc601f613560e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.150",
+      "ip": "172.16.1.49",
       "mac": "00:14:5e:55:62:e7",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.150",
+      "ip": "172.16.4.49",
       "mac": "00:14:5e:55:62:e8",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.151",
+      "ip": "172.17.4.49",
       "mac": "00:14:5e:55:62:d9",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 00094d631d3a7db75e684692b33f85021eea6620..4ce723bb51ea432b2e2c80362266c56f7ca89bcf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.106",
+      "ip": "172.16.1.5",
       "mac": "00:14:5e:55:61:94",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.106",
+      "ip": "172.16.4.5",
       "mac": "00:14:5e:55:61:95",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.107",
+      "ip": "172.17.4.5",
       "mac": "00:14:5e:55:61:96",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index 50db2a4943f34716028b1b88ee0b0761b6469ada..1b52affca831bddb56b626690841f14bf788a1e1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.151",
+      "ip": "172.16.1.50",
       "mac": "00:14:5e:55:5e:ac",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.151",
+      "ip": "172.16.4.50",
       "mac": "00:14:5e:55:5e:ad",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.152",
+      "ip": "172.17.4.50",
       "mac": "00:14:5e:55:5e:ae",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index 0954fe78368bbc6f005d59c6e5fe897066791679..fc0a1d229cf1d8960e121ff66d7dde4bcb5d118f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.152",
+      "ip": "172.16.1.51",
       "mac": "00:14:5e:55:5c:d5",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.152",
+      "ip": "172.16.4.51",
       "mac": "00:14:5e:55:5c:d6",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.153",
+      "ip": "172.17.4.51",
       "mac": "00:14:5e:55:5c:d7",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 56fe1c1ff85d8b83f455304f1ffb7523b8cbb85d..116d2323a05c0aaea70c569106b0ab03ee04b5ef 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.153",
+      "ip": "172.16.1.52",
       "mac": "00:14:5e:55:5d:b3",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.153",
+      "ip": "172.16.4.52",
       "mac": "00:14:5e:55:5d:b4",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.154",
+      "ip": "172.17.4.52",
       "mac": "00:14:5e:55:5d:b5",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 43d85174a67927450e12f132165950885561b06c..0f2d714d34c51bd3be8978a84bc2e76b6c41aa42 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.154",
+      "ip": "172.16.1.53",
       "mac": "00:14:5e:55:6c:1b",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.154",
+      "ip": "172.16.4.53",
       "mac": "00:14:5e:55:6c:1c",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.155",
+      "ip": "172.17.4.53",
       "mac": "00:14:5e:55:6c:1d",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 8c08eb6c236505bc19817f087aee14f9dfd28a83..87f92635f9a80fc1e9085814078d586cff42c2f8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.155",
+      "ip": "172.16.1.54",
       "mac": "00:14:5e:55:63:b6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.155",
+      "ip": "172.16.4.54",
       "mac": "00:14:5e:55:63:b7",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.156",
+      "ip": "172.17.4.54",
       "mac": "00:14:5e:55:63:b8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index f85d30e3f0509833e25a05495b548667dfbaf718..64d1c10f83d6231433659e779539687ea3399d1a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.156",
+      "ip": "172.16.1.55",
       "mac": "00:14:5e:55:5c:ed",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.156",
+      "ip": "172.16.4.55",
       "mac": "00:14:5e:55:5c:ee",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.157",
+      "ip": "172.17.4.55",
       "mac": "00:14:5e:55:5c:ef",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index a10c49441c3d59480633e1d0862a96f4a52dede2..71e5924ccb42c0cb0e509e76f48cd854aee24c64 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.157",
+      "ip": "172.16.1.56",
       "mac": "00:14:5e:55:60:cb",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.157",
+      "ip": "172.16.4.56",
       "mac": "00:14:5e:55:60:cc",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.158",
+      "ip": "172.17.4.56",
       "mac": "00:14:5e:55:60:cd",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index d88e9650dff4eca1730ee2f636678df786ec2980..9523a1ca78e72d372f3f15d3f46f41f44baef267 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.158",
+      "ip": "172.16.1.57",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.158",
+      "ip": "172.16.4.57",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.159",
+      "ip": "172.17.4.57",
       "mac": null,
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index 063217e17e23ca7aa1b6f6965d7ac5591b80e91e..98c04fa8bddc5aabcf94b58221040d20de148e48 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.159",
+      "ip": "172.16.1.58",
       "mac": "00:14:5e:55:5e:a6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.159",
+      "ip": "172.16.4.58",
       "mac": "00:14:5e:55:5e:a7",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.160",
+      "ip": "172.17.4.58",
       "mac": "00:14:5e:55:5e:a8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index a1ea9d6bb34525b955bb0a54c58c9be7516821ff..27a2fba10a96c74c21ac98aa3095c452bd8c1f4e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.160",
+      "ip": "172.16.1.59",
       "mac": "00:14:5e:55:5c:d8",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.160",
+      "ip": "172.16.4.59",
       "mac": "00:14:5e:55:5c:d9",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.161",
+      "ip": "172.17.4.59",
       "mac": "00:14:5e:55:5c:da",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index 28eaa45561d02ca453c2018ad83907a8b26360e0..79169cf5b7038930ac3767a103d3c33ea6296e99 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.107",
+      "ip": "172.16.1.6",
       "mac": "00:14:5e:55:58:ee",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.107",
+      "ip": "172.16.4.6",
       "mac": "00:14:5e:55:58:ef",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.108",
+      "ip": "172.17.4.6",
       "mac": "00:14:5e:55:58:f0",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index d264feb02c7b6d7f74b11bc35a10589af11ea9b4..dfc0475d3b051e40cf3b2eebe585a7f4a08d301a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.161",
+      "ip": "172.16.1.60",
       "mac": "00:14:5e:55:5b:5b",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.161",
+      "ip": "172.16.4.60",
       "mac": "00:14:5e:55:5b:5c",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.162",
+      "ip": "172.17.4.60",
       "mac": "00:14:5e:55:5b:5d",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index 5178f30f4cd9d8a8e3bd774cef268493367533ed..6b97a1a9d55ecbe2018a94d29d71302679f93267 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.162",
+      "ip": "172.16.1.61",
       "mac": "00:14:5e:55:58:49",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.162",
+      "ip": "172.16.4.61",
       "mac": "00:14:5e:55:58:4a",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.163",
+      "ip": "172.17.4.61",
       "mac": "00:14:5e:55:58:4b",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 723d3a10e5af2b96e9d150c59a98c558e60d14db..17d2099418a0c282383316058848b68eed094029 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.163",
+      "ip": "172.16.1.62",
       "mac": "00:14:5e:55:63:26",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.163",
+      "ip": "172.16.4.62",
       "mac": "00:14:5e:55:63:27",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.164",
+      "ip": "172.17.4.62",
       "mac": "00:14:5e:55:63:28",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index 3de10692266f60d4a7f86adc0ffde64120c03717..adb3178d1d18fef3d569d604c3513b15ce42b7a2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.164",
+      "ip": "172.16.1.63",
       "mac": "00:14:5e:55:5c:6c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.164",
+      "ip": "172.16.4.63",
       "mac": "00:14:5e:55:5c:6d",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.165",
+      "ip": "172.17.4.63",
       "mac": "00:14:5e:55:5c:6e",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index 7c0b83e0aa65c83c213c0d6ce0cb9bc65542ce67..39aa35754940c3ed7a063d8b43a69e42b50e76ad 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.165",
+      "ip": "172.16.1.64",
       "mac": "00:14:5e:55:5c:cf",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.165",
+      "ip": "172.16.4.64",
       "mac": "00:14:5e:55:5c:d0",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.166",
+      "ip": "172.17.4.64",
       "mac": "00:14:5e:55:5c:d1",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 8243da9b7dfd4bca405ab21bf43613e9b5a6b45f..817d81a20be2f22365458cfe7e1c3534cfa9e3d9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.166",
+      "ip": "172.16.1.65",
       "mac": "00:14:5e:55:59:f9",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.166",
+      "ip": "172.16.4.65",
       "mac": "00:14:5e:55:59:fa",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.167",
+      "ip": "172.17.4.65",
       "mac": "00:14:5e:55:59:fb",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index 1430e337cef3e65a8abcc512f02fe604168f9261..b12449d3a1b91c38595ad0779cd080225720350e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.167",
+      "ip": "172.16.1.66",
       "mac": "00:14:5e:55:5e:19",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.167",
+      "ip": "172.16.4.66",
       "mac": "00:14:5e:55:5e:1a",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.168",
+      "ip": "172.17.4.66",
       "mac": "00:14:5e:55:5e:1b",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index 1a8e715c557eefcfe665c330fdece6ac236e4c51..e546fc9c5d12f0104007aa43894f618796c68ea3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.168",
+      "ip": "172.16.1.67",
       "mac": "00:14:5e:55:5c:1b",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.168",
+      "ip": "172.16.4.67",
       "mac": "00:14:5e:55:5c:1c",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.169",
+      "ip": "172.17.4.67",
       "mac": "00:14:5e:55:5c:1d",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index bc06555f58c66510e58320e8e742e5b27e1cf34b..fff8740669cc760e86f2dda9e50be02c8a38c142 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.169",
+      "ip": "172.16.1.68",
       "mac": "00:14:5e:55:57:89",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.169",
+      "ip": "172.16.4.68",
       "mac": "00:14:5e:55:57:8a",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.170",
+      "ip": "172.17.4.68",
       "mac": "00:14:5e:55:57:8b",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 2b5e209dba1dddd80214257de8b807c8ac2b508c..1ef18204d32f57c128da5bb3f5d3480047f9f491 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.170",
+      "ip": "172.16.1.69",
       "mac": "00:14:5e:55:63:ce",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.170",
+      "ip": "172.16.4.69",
       "mac": "00:14:5e:55:63:cf",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.171",
+      "ip": "172.17.4.69",
       "mac": "00:14:5e:55:63:d0",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index 6e0398041a2dff2492fca66b4feb6885c743e734..b15628eb1b3dcf3d4f13dbe11eb87da63fc36483 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.108",
+      "ip": "172.16.1.7",
       "mac": "00:14:5e:55:5e:7c",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.108",
+      "ip": "172.16.4.7",
       "mac": "00:14:5e:55:5e:7d",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.109",
+      "ip": "172.17.4.7",
       "mac": "00:14:5e:55:5e:7e",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index db97c61cffab38208e4932bb11d032eb7a5d3b99..b4f1b9b8e0dbe59dcf24d8d03ed8f5278999dc96 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.171",
+      "ip": "172.16.1.70",
       "mac": "00:14:5e:55:6a:fe",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.171",
+      "ip": "172.16.4.70",
       "mac": "00:14:5e:55:6a:ff",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.172",
+      "ip": "172.17.4.70",
       "mac": "00:14:5e:55:6b:00",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index f3d0c50689a5be2dee1ad0b085b25e9bb4e20e9d..56475c420b4a6d75ffbab7979b248ad368c6b56f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.172",
+      "ip": "172.16.1.71",
       "mac": "00:14:5e:55:59:44",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.172",
+      "ip": "172.16.4.71",
       "mac": "00:14:5e:55:59:45",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.173",
+      "ip": "172.17.4.71",
       "mac": "00:14:5e:55:59:46",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index 61f298eae37dccfee12208b69d64440bc26d8516..beae6941d6b681c7884ed26144210fad1dc53b43 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.173",
+      "ip": "172.16.1.72",
       "mac": "00:14:5e:55:5a:3e",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.173",
+      "ip": "172.16.4.72",
       "mac": "00:14:5e:55:5a:3f",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.174",
+      "ip": "172.17.4.72",
       "mac": "00:14:5e:55:5a:40",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index e458ba346a99a948ca35079d596e7c6da12275d2..a66e847aceb27702dc768b727b14ba11bc65e486 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.174",
+      "ip": "172.16.1.73",
       "mac": "00:14:5e:55:6a:1a",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.174",
+      "ip": "172.16.4.73",
       "mac": "00:14:5e:55:6a:1b",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.175",
+      "ip": "172.17.4.73",
       "mac": "00:14:5e:55:6a:1c",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index 513a129da8632b4d11936036ead4254fcc1ecd33..7b4d9d68ea966383a44319ed57a575e669756f8d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.175",
+      "ip": "172.16.1.74",
       "mac": "00:14:5e:55:64:04",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.175",
+      "ip": "172.16.4.74",
       "mac": "00:14:5e:55:64:05",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.176",
+      "ip": "172.17.4.74",
       "mac": "00:14:5e:55:64:06",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index c757bf6a5e1b0bbc3c2f4f49467fb4bf19325e8c..f423eea06538ae5afd87f6651400827b75474543 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.176",
+      "ip": "172.16.1.75",
       "mac": "00:14:5e:55:5e:af",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.176",
+      "ip": "172.16.4.75",
       "mac": "00:14:5e:55:5e:b0",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.177",
+      "ip": "172.17.4.75",
       "mac": "00:14:5e:55:5e:b1",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index dc3996a590262174e3d29d22e35e61aacad3f58e..ab49e7ba153a39d9c40327189026e1a790d8f34a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.177",
+      "ip": "172.16.1.76",
       "mac": "00:14:5e:55:5d:08",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.177",
+      "ip": "172.16.4.76",
       "mac": "00:14:5e:55:5d:09",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.178",
+      "ip": "172.17.4.76",
       "mac": "00:14:5e:55:5d:0a",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index d77ec103cdb95da708632e49e979e8eac788a948..03848ace109e32419cb48a6c1a6b56ec27599c74 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.178",
+      "ip": "172.16.1.77",
       "mac": "00:14:5e:55:63:5f",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.178",
+      "ip": "172.16.4.77",
       "mac": "00:14:5e:55:63:60",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.179",
+      "ip": "172.17.4.77",
       "mac": "00:14:5e:55:63:61",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index 18b100d4d27e3493cc9017415e8cb285babdd19d..f907402a3941c81f50fbf96964a86b8e1970f5bc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.179",
+      "ip": "172.16.1.78",
       "mac": "00:14:5e:55:63:fb",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.179",
+      "ip": "172.16.4.78",
       "mac": "00:14:5e:55:63:fc",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.180",
+      "ip": "172.17.4.78",
       "mac": "00:14:5e:55:63:fd",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index aa622e7c90f1be076aef76f776b41c4719b62d47..af02a126d593ff5691248afc180df8ad3775df61 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.180",
+      "ip": "172.16.1.79",
       "mac": "00:14:5e:55:62:ed",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.180",
+      "ip": "172.16.4.79",
       "mac": "00:14:5e:55:62:ee",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.181",
+      "ip": "172.17.4.79",
       "mac": "00:14:5e:55:62:ef",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index 1b868697299533009e5a3bf5c8725c2ae4744d23..59eb0b22b34aa9c8943083ab579fe54edbf1c6e7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.109",
+      "ip": "172.16.1.8",
       "mac": "00:14:5e:55:60:f8",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.109",
+      "ip": "172.16.4.8",
       "mac": "00:14:5e:55:60:f9",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.110",
+      "ip": "172.17.4.8",
       "mac": "00:14:5e:55:60:fa",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 186b5aec1bc8a3d1e59fdd6e2fcc74a2ed13ca4a..17bcaa3f14a604604f0c0c4634aaf9e0bfa73f5e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.181",
+      "ip": "172.16.1.80",
       "mac": "00:14:5e:55:5c:ae",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.181",
+      "ip": "172.16.4.80",
       "mac": "00:14:5e:55:5c:af",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.182",
+      "ip": "172.17.1.80",
       "mac": "00:14:5e:55:5c:b0",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 05b32e797863f35a730d2ac12496e579dfbb5c3c..9d9951ca74b704cd4079704f189aa85b3a9594c3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.182",
+      "ip": "172.16.1.81",
       "mac": "00:14:5e:55:58:a6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.182",
+      "ip": "172.16.4.81",
       "mac": "00:14:5e:55:58:a7",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.183",
+      "ip": "172.17.1.81",
       "mac": "00:14:5e:55:58:a8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index 073582efe9c2838f83ae814cec941dd0214d673f..d5012d1a668309f1c86273f2480203f7460d0afa 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.183",
+      "ip": "172.16.1.82",
       "mac": "00:14:5e:55:68:85",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.183",
+      "ip": "172.16.4.82",
       "mac": "00:14:5e:55:68:86",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.184",
+      "ip": "172.17.1.82",
       "mac": "00:14:5e:55:68:87",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 9604fb8d6da3726625c4a905611950a0724c518d..06757f39ac91b59a66f7adcecd37ffb7f9b6f707 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.184",
+      "ip": "172.16.1.83",
       "mac": "00:14:5e:55:6d:23",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.184",
+      "ip": "172.16.4.83",
       "mac": "00:14:5e:55:6d:24",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.185",
+      "ip": "172.17.1.83",
       "mac": "00:14:5e:55:6d:25",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index d85cdbff84b9e817a8343592b353d81e7b042b87..e219eff9bdba451d6016a9e4dc2a25ad6e64f54c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.185",
+      "ip": "172.16.1.84",
       "mac": "00:14:5e:55:5c:48",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.185",
+      "ip": "172.16.4.84",
       "mac": "00:14:5e:55:5c:49",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.186",
+      "ip": "172.17.1.84",
       "mac": "00:14:5e:55:5c:4a",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index c3758684901065df37074c766c25dfeb0208a6cc..930e40a13ddb826ae61e7d6b9134a52b0a4930cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.186",
+      "ip": "172.16.1.85",
       "mac": "00:14:5e:55:59:41",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.186",
+      "ip": "172.16.4.85",
       "mac": "00:14:5e:55:59:42",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.187",
+      "ip": "172.17.1.85",
       "mac": "00:14:5e:55:59:43",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index 97796ec023451fdd9a8dcb92054c5f3936456cb2..13b22263c7087b7058b086bcce5cfa9d6f83a47e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.187",
+      "ip": "172.16.1.86",
       "mac": "00:14:5e:55:68:ca",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.187",
+      "ip": "172.16.4.86",
       "mac": "00:14:5e:55:68:cb",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.188",
+      "ip": "172.17.1.86",
       "mac": "00:14:5e:55:68:cc",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index 0615f6111fb9eb10cedc1a4158a64140727513d7..020ebb98b4897f0c2a06593fa7521e9ec540609f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.188",
+      "ip": "172.16.1.87",
       "mac": "00:14:5e:55:5e:28",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.188",
+      "ip": "172.16.4.87",
       "mac": "00:14:5e:55:5e:29",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.189",
+      "ip": "172.17.1.87",
       "mac": "00:14:5e:55:5e:2a",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index 521917cf09bebaf164a944aee056e7747570c137..b981746876c04af639cc1618ccef50392e9d0d48 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.189",
+      "ip": "172.16.1.88",
       "mac": "00:14:5e:55:5d:6b",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.189",
+      "ip": "172.16.4.88",
       "mac": "00:14:5e:55:5d:6c",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.190",
+      "ip": "172.17.1.88",
       "mac": "00:14:5e:55:5d:6d",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index daee0b4f48e8d137cd42465a7cdb0f818453de8a..fc0e76db48de6b19d284aa06739a02d88a0ba579 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.190",
+      "ip": "172.16.1.89",
       "mac": "00:14:5e:55:6d:05",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.190",
+      "ip": "172.16.4.89",
       "mac": "00:14:5e:55:6d:06",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.191",
+      "ip": "172.17.1.89",
       "mac": "00:14:5e:55:6d:07",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 556fcf5615a9fd04d436cbf574dbf82b1510aae5..5aa89197dc427da1680846d1fe1dc2a665c86c94 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.110",
+      "ip": "172.16.1.9",
       "mac": "00:14:5e:55:5e:e8",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.110",
+      "ip": "172.16.4.9",
       "mac": "00:14:5e:55:5e:e9",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.111",
+      "ip": "172.17.4.9",
       "mac": "00:14:5e:55:5e:ea",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index 6f6bf4ff07139a9a19331bde8c16f46f1db37d5f..7129833f4bf66807ad276320565ef4051bb6729f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.191",
+      "ip": "172.16.1.90",
       "mac": "00:14:5e:55:6d:29",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.191",
+      "ip": "172.16.4.90",
       "mac": "00:14:5e:55:6d:2a",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.192",
+      "ip": "172.17.1.90",
       "mac": "00:14:5e:55:6d:2b",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 68a8f442be29f299f5b00aed32ceaefbe7182d4e..8364ba5d4dee9357b1f8023993a787de8087a159 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.192",
+      "ip": "172.16.1.91",
       "mac": "00:14:5e:55:5c:c6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.192",
+      "ip": "172.16.4.91",
       "mac": "00:14:5e:55:5c:c7",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.193",
+      "ip": "172.17.1.91",
       "mac": "00:14:5e:55:5c:c8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 78ff4b0c3f8c17006413115ed9a75600a0b58568..800b4cfd2660c4d8a1fb290f59fa95ad43ffe614 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.193",
+      "ip": "172.16.1.92",
       "mac": "00:14:5e:55:6a:4a",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.193",
+      "ip": "172.16.4.92",
       "mac": "00:14:5e:55:6a:4b",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.194",
+      "ip": "172.17.1.92",
       "mac": "00:14:5e:55:6a:4c",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index d989630fb06f2eb7af71b3c2bab69c66c7b195d6..6bb02b028874e4f184ffd8075fc7607d78a55209 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -23,7 +23,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.194",
+      "ip": "172.16.1.93",
       "mac": "00:14:5e:55:6d:14",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.194",
+      "ip": "172.16.4.93",
       "mac": "00:14:5e:55:6d:15",
       "management": false,
       "mountable": true,
@@ -52,7 +52,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.195",
+      "ip": "172.17.1.93",
       "mac": "00:14:5e:55:6d:16",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index e631b98cbfaae9be9b2a38f72e3fe20655ffa19c..61351d28e50233b0b562ab0abddb346df94067cb 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.196",
+      "ip": "172.16.2.1",
       "mac": "00:14:5e:57:67:04",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.196",
+      "ip": "172.16.5.1",
       "mac": "00:14:5e:57:67:02",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d",
       "interface": "InfiniBand",
-      "ip": "172.16.4.196",
+      "ip": "172.18.2.1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.196",
+      "ip": "172.18.2.1",
       "mac": "00:60:dd:47:b6:e9",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.242",
+      "ip": "172.17.2.1",
       "mac": "00:14:5e:57:67:06",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 7fec80914a919eed5aa8f228a6d1b7dbd90823ed..aa24391943c58e003f4b527e2cb4810c104a45a5 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.205",
+      "ip": "172.16.2.10",
       "mac": "00:14:5e:57:cb:f6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.205",
+      "ip": "172.16.5.10",
       "mac": "00:14:5e:57:cb:f4",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd",
       "interface": "InfiniBand",
-      "ip": "172.16.4.205",
+      "ip": "172.18.2.10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.205",
+      "ip": "172.18.2.10",
       "mac": "00:60:dd:47:b7:28",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.251",
+      "ip": "172.17.2.10",
       "mac": "00:14:5e:57:cb:f8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index f185cb7439ffd0bfe59aec002ce76fe6deba7224..d474cb455505ab2f7be126f391a8726403cc4bca 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.197",
+      "ip": "172.16.2.2",
       "mac": "00:14:5e:57:cc:3e",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.197",
+      "ip": "172.16.5.2",
       "mac": "00:14:5e:57:cc:3c",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85",
       "interface": "InfiniBand",
-      "ip": "172.16.4.197",
+      "ip": "172.18.2.2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.197",
+      "ip": "172.18.2.2",
       "mac": "00:60:dd:47:b6:7a",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.243",
+      "ip": "172.17.2.2",
       "mac": "00:14:5e:57:cc:40",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index b8844270f8a33c4af098b6bd3b4777b88a2a2c0c..ad1da96cc5d95e6c432133101746c92a599dfebf 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.198",
+      "ip": "172.16.2.3",
       "mac": "00:14:5e:57:6d:a0",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.198",
+      "ip": "172.16.5.3",
       "mac": "00:14:5e:57:6d:9e",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed",
       "interface": "InfiniBand",
-      "ip": "172.16.4.198",
+      "ip": "172.18.2.3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.198",
+      "ip": "172.18.2.3",
       "mac": "00:60:dd:47:b5:69",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.244",
+      "ip": "172.17.2.3",
       "mac": "00:14:5e:57:6d:a2",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 1ce296ef12b1c016e2616c40cd110dfc623c26a6..826da66f8c835da8184fbb3859bf6e2a58f01aec 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.199",
+      "ip": "172.16.2.4",
       "mac": "00:14:5e:57:c4:d0",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.199",
+      "ip": "172.16.5.4",
       "mac": "00:14:5e:57:c4:ce",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85",
       "interface": "InfiniBand",
-      "ip": "172.16.4.199",
+      "ip": "172.18.2.4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.199",
+      "ip": "172.18.2.4",
       "mac": "00:60:dd:47:b7:6e",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.245",
+      "ip": "172.17.2.4",
       "mac": "00:14:5e:57:c4:d2",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index 8ef3d3aa4f7469f79207aaf9a266208053e2e0e4..d765111f4318afed111246f6a1f266fabda5c042 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.200",
+      "ip": "172.16.2.5",
       "mac": "00:14:5e:57:6d:46",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.200",
+      "ip": "172.16.5.5",
       "mac": "00:14:5e:57:6d:44",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d",
       "interface": "InfiniBand",
-      "ip": "172.16.4.200",
+      "ip": "172.18.2.5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.200",
+      "ip": "172.18.2.5",
       "mac": "00:60:dd:47:b6:50",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.246",
+      "ip": "172.17.2.5",
       "mac": "00:14:5e:57:6d:48",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 9b67f1c4c6c9d00f26772fd79e8764a6a33adee9..a823ce3cb3831e820c037e875232225b4b9630e9 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.201",
+      "ip": "172.16.2.6",
       "mac": "00:14:5e:57:82:a6",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.201",
+      "ip": "172.16.5.6",
       "mac": "00:14:5e:57:82:a4",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d",
       "interface": "InfiniBand",
-      "ip": "172.16.4.201",
+      "ip": "172.18.2.6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.201",
+      "ip": "172.18.2.6",
       "mac": "00:60:dd:47:b6:7d",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.247",
+      "ip": "172.17.2.6",
       "mac": "00:14:5e:57:82:a8",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index e7e2909e23e35b99400ca0f111b6598ae475140f..b3ab6b17dc4106f4c20bd1adc02e049803007c24 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.202",
+      "ip": "172.16.2.7",
       "mac": "00:14:5e:57:cc:02",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.202",
+      "ip": "172.16.5.7",
       "mac": "00:14:5e:57:cc:00",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d",
       "interface": "InfiniBand",
-      "ip": "172.16.4.202",
+      "ip": "172.18.2.7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.202",
+      "ip": "172.18.2.7",
       "mac": "00:60:dd:47:86:96",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.248",
+      "ip": "172.17.2.7",
       "mac": "00:14:5e:57:cc:04",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 1270326f791c009bd314f19d1ed5286a9fa9399e..e739911ccdf4fe7ce9e6a5f9ab31171d5bc301b6 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.203",
+      "ip": "172.16.2.8",
       "mac": "00:14:5e:57:cb:d8",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.203",
+      "ip": "172.16.5.8",
       "mac": "00:14:5e:57:cb:d6",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49",
       "interface": "InfiniBand",
-      "ip": "172.16.4.203",
+      "ip": "172.18.2.8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.203",
+      "ip": "172.18.2.8",
       "mac": "00:60:dd:47:b5:14",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.249",
+      "ip": "172.17.2.8",
       "mac": "00:14:5e:57:cb:da",
       "management": true,
       "mountable": false,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index adb29def50fb3cacc8fe38eb44d8e557357bcb23..bf2760ce348fc07b98d3fac997895534e549023f 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -23,7 +23,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.1.204",
+      "ip": "172.16.2.9",
       "mac": "00:14:5e:57:cb:ae",
       "management": false,
       "mountable": true,
@@ -38,7 +38,7 @@
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.133.204",
+      "ip": "172.16.5.9",
       "mac": "00:14:5e:57:cb:ac",
       "management": false,
       "mountable": true,
@@ -54,7 +54,7 @@
       "enabled": true,
       "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85",
       "interface": "InfiniBand",
-      "ip": "172.16.4.204",
+      "ip": "172.18.2.9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -77,7 +77,7 @@
       "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
-      "ip": "172.16.3.204",
+      "ip": "172.18.2.9",
       "mac": "00:60:dd:47:7d:8c",
       "management": false,
       "mountable": true,
@@ -91,7 +91,7 @@
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.16.7.250",
+      "ip": "172.17.2.9",
       "mac": "00:14:5e:57:cb:b0",
       "management": true,
       "mountable": false,
diff --git a/generators/input/bordeaux-bordeplage.yaml b/generators/input/bordeaux-bordeplage.yaml
index 3088b9cc032c5a88f65b1c4af267075399762647..0b35da95145d3abdf6445956ae5cfc304f13e9c1 100644
--- a/generators/input/bordeaux-bordeplage.yaml
+++ b/generators/input/bordeaux-bordeplage.yaml
@@ -17,18 +17,18 @@ bordeplage-1:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56
-      ip: 192.168.132.1
+      ip: 172.18.0.1
     bmc:
       mac: 00:14:22:0c:d9:ec
-      ip: 172.16.7.51
+      ip: 172.17.0.1
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57
     eth0:
       mac: 00:14:22:0c:d9:ec
-      ip: 172.16.1.51
+      ip: 172.16.0.1
     eth1:
       mac: 00:14:22:0c:d9:ed
-      ip: 192.168.133.51
+      ip: 172.16.3.1
 bordeplage-2:
   bios:
     version: A03
@@ -47,18 +47,18 @@ bordeplage-2:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25
-      ip: 192.168.132.2
+      ip: 172.18.0.2
     bmc:
       mac: 00:14:22:0c:da:46
-      ip: 172.16.7.52
+      ip: 172.17.0.2
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26
     eth0:
       mac: 00:14:22:0c:da:46
-      ip: 172.16.1.52
+      ip: 172.16.0.2
     eth1:
       mac: 00:14:22:0c:da:47
-      ip: 192.168.133.52
+      ip: 172.16.3.2
 bordeplage-3:
   bios:
     version: A05
@@ -77,18 +77,18 @@ bordeplage-3:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72
-      ip: 192.168.132.3
+      ip: 172.18.0.3
     bmc:
       mac: 00:14:22:0c:e1:66
-      ip: 172.16.7.53
+      ip: 172.17.0.3
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73
     eth0:
       mac: 00:14:22:0c:e1:66
-      ip: 172.16.1.53
+      ip: 172.16.0.3
     eth1:
       mac: 00:14:22:0c:e1:67
-      ip: 192.168.133.53
+      ip: 172.16.3.3
 bordeplage-4:
   bios:
     version: A05
@@ -107,18 +107,18 @@ bordeplage-4:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9
-      ip: 192.168.132.4
+      ip: 172.18.0.4
     bmc:
       mac: 00:14:22:0c:d9:fa
-      ip: 172.16.7.54
+      ip: 172.17.0.4
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea
     eth0:
       mac: 00:14:22:0c:d9:fa
-      ip: 172.16.1.54
+      ip: 172.16.0.4
     eth1:
       mac: 00:14:22:0c:d9:fb
-      ip: 192.168.133.54
+      ip: 172.16.3.4
 bordeplage-5:
   bios:
     version: A03
@@ -137,18 +137,18 @@ bordeplage-5:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5
-      ip: 192.168.132.5
+      ip: 172.18.0.5
     bmc:
       mac: 00:14:22:0c:e1:74
-      ip: 172.16.7.55
+      ip: 172.17.0.5
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6
     eth0:
       mac: 00:14:22:0c:e1:74
-      ip: 172.16.1.55
+      ip: 172.16.0.5
     eth1:
       mac: 00:14:22:0c:e1:75
-      ip: 192.168.133.55
+      ip: 172.16.3.5
 bordeplage-6:
   bios:
     version: A03
@@ -167,18 +167,18 @@ bordeplage-6:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39
-      ip: 192.168.132.6
+      ip: 172.18.0.6
     bmc:
       mac: 00:14:22:0c:da:6e
-      ip: 172.16.7.56
+      ip: 172.17.0.6
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a
     eth0:
       mac: 00:14:22:0c:da:6e
-      ip: 172.16.1.56
+      ip: 172.16.0.6
     eth1:
       mac: 00:14:22:0c:da:6f
-      ip: 192.168.133.56
+      ip: 172.16.3.6
 bordeplage-7:
   bios:
     version: A03
@@ -197,18 +197,18 @@ bordeplage-7:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e
-      ip: 192.168.132.7
+      ip: 172.18.0.7
     bmc:
       mac: 00:14:22:0c:e1:44
-      ip: 172.16.7.57
+      ip: 172.17.0.7
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f
     eth0:
       mac: 00:14:22:0c:e1:44
-      ip: 172.16.1.57
+      ip: 172.16.0.7
     eth1:
       mac: 00:14:22:0c:e1:45
-      ip: 192.168.133.57
+      ip: 172.16.3.7
 bordeplage-8:
   bios:
     version: A05
@@ -227,18 +227,18 @@ bordeplage-8:
   network_interfaces:
     ib0:
       guid:
-      ip: 192.168.132.8
+      ip: 172.18.0.8
     bmc:
       mac: 00:14:22:0c:da:40
-      ip: 172.16.7.58
+      ip: 172.17.0.8
     ib1:
       guid:
     eth0:
       mac: 00:14:22:0c:da:40
-      ip: 172.16.1.58
+      ip: 172.16.0.8
     eth1:
       mac: 00:14:22:0c:da:41
-      ip: 192.168.133.58
+      ip: 172.16.3.8
 bordeplage-9:
   bios:
     version: A05
@@ -257,18 +257,18 @@ bordeplage-9:
   network_interfaces:
     ib0:
       guid:
-      ip: 192.168.132.9
+      ip: 172.18.0.9
     bmc:
       mac: 00:14:22:0c:da:50
-      ip: 172.16.7.59
+      ip: 172.17.0.9
     ib1:
       guid:
     eth0:
       mac: 00:14:22:0c:da:50
-      ip: 172.16.1.59
+      ip: 172.16.0.9
     eth1:
       mac: 00:14:22:0c:da:51
-      ip: 192.168.133.59
+      ip: 172.16.3.9
 bordeplage-10:
   bios:
     version: A05
@@ -287,18 +287,18 @@ bordeplage-10:
   network_interfaces:
     ib0:
       guid:
-      ip: 192.168.132.10
+      ip: 172.18.0.10
     bmc:
       mac: 00:14:22:0c:da:76
-      ip: 172.16.7.60
+      ip: 172.17.0.10
     ib1:
       guid:
     eth0:
       mac:
-      ip: 172.16.1.60
+      ip: 172.16.0.10
     eth1:
       mac:
-      ip: 192.168.133.60
+      ip: 172.16.3.10
 bordeplage-11:
   bios:
     version: A03
@@ -317,18 +317,18 @@ bordeplage-11:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a
-      ip: 192.168.132.11
+      ip: 172.18.0.11
     bmc:
       mac: 00:14:22:0c:d9:bc
-      ip: 172.16.7.61
+      ip: 172.17.0.11
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b
     eth0:
       mac: 00:14:22:0c:d9:bc
-      ip: 172.16.1.61
+      ip: 172.16.0.11
     eth1:
       mac: 00:14:22:0c:d9:bd
-      ip: 192.168.133.61
+      ip: 172.16.3.11
 bordeplage-12:
   bios:
     version: A03
@@ -347,18 +347,18 @@ bordeplage-12:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e
-      ip: 192.168.132.12
+      ip: 172.18.0.12
     bmc:
       mac: 00:14:22:0c:da:74
-      ip: 172.16.7.62
+      ip: 172.17.0.12
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f
     eth0:
       mac: 00:14:22:0c:da:74
-      ip: 172.16.1.62
+      ip: 172.16.0.12
     eth1:
       mac: 00:14:22:0c:da:75
-      ip: 192.168.133.62
+      ip: 172.16.3.12
 bordeplage-13:
   bios:
     version: A03
@@ -377,18 +377,18 @@ bordeplage-13:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b
-      ip: 192.168.132.13
+      ip: 172.18.0.13
     bmc:
       mac: 00:14:22:0c:da:82
-      ip: 172.16.7.63
+      ip: 172.17.0.13
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c
     eth0:
       mac: 00:14:22:0c:da:82
-      ip: 172.16.1.63
+      ip: 172.16.0.13
     eth1:
       mac: 00:14:22:0c:da:83
-      ip: 192.168.133.63
+      ip: 172.16.3.13
 bordeplage-14:
   bios:
     version: A05
@@ -407,18 +407,18 @@ bordeplage-14:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52
-      ip: 192.168.132.14
+      ip: 172.18.0.14
     bmc:
       mac: 00:14:22:0c:da:90
-      ip: 172.16.7.64
+      ip: 172.17.0.14
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53
     eth0:
       mac: 00:14:22:0c:da:90
-      ip: 172.16.1.64
+      ip: 172.16.0.14
     eth1:
       mac: 00:14:22:0c:da:91
-      ip: 192.168.133.64
+      ip: 172.16.3.14
 bordeplage-15:
   bios:
     version: A05
@@ -437,18 +437,18 @@ bordeplage-15:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41
-      ip: 192.168.132.15
+      ip: 172.18.0.15
     bmc:
       mac: 00:14:22:0c:da:c0
-      ip: 172.16.7.65
+      ip: 172.17.0.15
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42
     eth0:
       mac: 00:14:22:0c:da:c0
-      ip: 172.16.1.65
+      ip: 172.16.0.15
     eth1:
       mac: 00:14:22:0c:da:c1
-      ip: 192.168.133.65
+      ip: 172.16.3.15
 bordeplage-16:
   bios:
     version: A03
@@ -467,18 +467,18 @@ bordeplage-16:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74
-      ip: 192.168.132.16
+      ip: 172.18.0.16
     bmc:
       mac: 00:14:22:0c:da:44
-      ip: 172.16.7.66
+      ip: 172.17.0.16
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75
     eth0:
       mac: 00:14:22:0c:da:44
-      ip: 172.16.1.66
+      ip: 172.16.0.16
     eth1:
       mac: 00:14:22:0c:da:45
-      ip: 192.168.133.66
+      ip: 172.16.3.16
 bordeplage-17:
   bios:
     version: A03
@@ -497,18 +497,18 @@ bordeplage-17:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5
-      ip: 192.168.132.17
+      ip: 172.18.0.17
     bmc:
       mac: 00:14:22:0c:da:62
-      ip: 172.16.7.67
+      ip: 172.17.0.17
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6
     eth0:
       mac: 00:14:22:0c:da:62
-      ip: 172.16.1.67
+      ip: 172.16.0.17
     eth1:
       mac: 00:14:22:0c:da:63
-      ip: 192.168.133.67
+      ip: 172.16.3.17
 bordeplage-18:
   bios:
     version: A03
@@ -527,18 +527,18 @@ bordeplage-18:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09
-      ip: 192.168.132.18
+      ip: 172.18.0.18
     bmc:
       mac: 00:14:22:0c:da:a2
-      ip: 172.16.7.68
+      ip: 172.17.0.18
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a
     eth0:
       mac: 00:14:22:0c:da:a2
-      ip: 172.16.1.68
+      ip: 172.16.0.18
     eth1:
       mac: 00:14:22:0c:da:a3
-      ip: 192.168.133.68
+      ip: 172.16.3.18
 bordeplage-19:
   bios:
     version: A03
@@ -557,18 +557,18 @@ bordeplage-19:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5
-      ip: 192.168.132.19
+      ip: 172.18.0.19
     bmc:
       mac: 00:14:22:0c:b4:00
-      ip: 172.16.7.69
+      ip: 172.17.0.19
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6
     eth0:
       mac: 00:14:22:0c:b4:00
-      ip: 172.16.1.69
+      ip: 172.16.0.19
     eth1:
       mac: 00:14:22:0c:b4:01
-      ip: 192.168.133.69
+      ip: 172.16.3.19
 bordeplage-20:
   bios:
     version: A03
@@ -587,18 +587,18 @@ bordeplage-20:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9
-      ip: 192.168.132.20
+      ip: 172.18.0.20
     bmc:
       mac: 00:14:22:0c:b3:1c
-      ip: 172.16.7.70
+      ip: 172.17.0.20
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba
     eth0:
       mac: 00:14:22:0c:b3:1c
-      ip: 172.16.1.70
+      ip: 172.16.0.20
     eth1:
       mac: 00:14:22:0c:b3:1d
-      ip: 192.168.133.70
+      ip: 172.16.3.20
 bordeplage-21:
   bios:
     version: A03
@@ -617,18 +617,18 @@ bordeplage-21:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a
-      ip: 192.168.132.21
+      ip: 172.18.0.21
     bmc:
       mac: 00:14:22:0c:e1:48
-      ip: 172.16.7.71
+      ip: 172.17.0.21
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b
     eth0:
       mac: 00:14:22:0c:e1:48
-      ip: 172.16.1.71
+      ip: 172.16.0.21
     eth1:
       mac: 00:14:22:0c:e1:49
-      ip: 192.168.133.71
+      ip: 172.16.3.21
 bordeplage-22:
   bios:
     version: A03
@@ -647,18 +647,18 @@ bordeplage-22:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42
-      ip: 192.168.132.22
+      ip: 172.18.0.22
     bmc:
       mac: 00:14:22:0c:dd:02
-      ip: 172.16.7.72
+      ip: 172.17.0.22
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43
     eth0:
       mac: 00:14:22:0c:dd:02
-      ip: 172.16.1.72
+      ip: 172.16.0.22
     eth1:
       mac: 00:14:22:0c:dd:03
-      ip: 192.168.133.72
+      ip: 172.16.3.22
 bordeplage-23:
   bios:
     version: A03
@@ -677,18 +677,18 @@ bordeplage-23:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89
-      ip: 192.168.132.23
+      ip: 172.18.0.23
     bmc:
       mac: 00:14:22:0c:e1:4c
-      ip: 172.16.7.73
+      ip: 172.17.0.23
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a
     eth0:
       mac: 00:14:22:0c:e1:4c
-      ip: 172.16.1.73
+      ip: 172.16.0.23
     eth1:
       mac: 00:14:22:0c:e1:4d
-      ip: 192.168.133.73
+      ip: 172.16.3.23
 bordeplage-24:
   bios:
     version: A03
@@ -707,18 +707,18 @@ bordeplage-24:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed
-      ip: 192.168.132.24
+      ip: 172.18.0.24
     bmc:
       mac: 00:14:22:0c:e0:e0
-      ip: 172.16.7.74
+      ip: 172.17.0.24
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee
     eth0:
       mac: 00:14:22:0c:e0:e0
-      ip: 172.16.1.74
+      ip: 172.16.0.24
     eth1:
       mac: 00:14:22:0c:e0:e1
-      ip: 192.168.133.74
+      ip: 172.16.3.24
 bordeplage-25:
   bios:
     version: A03
@@ -737,18 +737,18 @@ bordeplage-25:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b
-      ip: 192.168.132.25
+      ip: 172.18.0.25
     bmc:
       mac: 00:14:22:0c:e1:76
-      ip: 172.16.7.75
+      ip: 172.17.0.25
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c
     eth0:
       mac: 00:14:22:0c:e1:76
-      ip: 172.16.1.75
+      ip: 172.16.0.25
     eth1:
       mac: 00:14:22:0c:e1:77
-      ip: 192.168.133.75
+      ip: 172.16.3.25
 bordeplage-26:
   bios:
     version: A03
@@ -767,18 +767,18 @@ bordeplage-26:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95
-      ip: 192.168.132.26
+      ip: 172.18.0.26
     bmc:
       mac: 00:14:22:0c:e1:52
-      ip: 172.16.7.76
+      ip: 172.17.0.26
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96
     eth0:
       mac: 00:14:22:0c:e1:52
-      ip: 172.16.1.76
+      ip: 172.16.0.26
     eth1:
       mac: 00:14:22:0c:e1:53
-      ip: 192.168.133.76
+      ip: 172.16.3.26
 bordeplage-27:
   bios:
     version: A03
@@ -797,18 +797,18 @@ bordeplage-27:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56
-      ip: 192.168.132.27
+      ip: 172.18.0.27
     bmc:
       mac: 00:14:22:0c:e1:7e
-      ip: 172.16.7.77
+      ip: 172.17.0.27
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57
     eth0:
       mac: 00:14:22:0c:e1:7e
-      ip: 172.16.1.77
+      ip: 172.16.0.27
     eth1:
       mac: 00:14:22:0c:e1:7f
-      ip: 192.168.133.77
+      ip: 172.16.3.27
 bordeplage-28:
   bios:
     version: A03
@@ -827,18 +827,18 @@ bordeplage-28:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99
-      ip: 192.168.132.28
+      ip: 172.18.0.28
     bmc:
       mac: 00:14:22:0c:e1:8c
-      ip: 172.16.7.78
+      ip: 172.17.0.28
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a
     eth0:
       mac: 00:14:22:0c:e1:8c
-      ip: 172.16.1.78
+      ip: 172.16.0.28
     eth1:
       mac: 00:14:22:0c:e1:8d
-      ip: 192.168.133.78
+      ip: 172.16.3.28
 bordeplage-29:
   bios:
     version: A03
@@ -857,18 +857,18 @@ bordeplage-29:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a
-      ip: 192.168.132.29
+      ip: 172.18.0.29
     bmc:
       mac: 00:14:22:0c:e1:0a
-      ip: 172.16.7.79
+      ip: 172.17.0.29
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b
     eth0:
       mac: 00:14:22:0c:e1:0a
-      ip: 172.16.1.79
+      ip: 172.16.0.29
     eth1:
       mac: 00:14:22:0c:e1:0b
-      ip: 192.168.133.79
+      ip: 172.16.3.29
 bordeplage-30:
   bios:
     version: A05
@@ -887,18 +887,18 @@ bordeplage-30:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd
-      ip: 192.168.132.30
+      ip: 172.18.0.30
     bmc:
       mac: 00:14:22:0c:e1:92
-      ip: 172.16.7.80
+      ip: 172.17.0.30
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe
     eth0:
       mac: 00:14:22:0c:e1:92
-      ip: 172.16.1.80
+      ip: 172.16.0.30
     eth1:
       mac: 00:14:22:0c:e1:93
-      ip: 192.168.133.80
+      ip: 172.16.3.30
 bordeplage-31:
   bios:
     version: A05
@@ -917,18 +917,18 @@ bordeplage-31:
   network_interfaces:
     ib0:
       guid:
-      ip: 192.168.132.31
+      ip: 172.18.0.31
     bmc:
       mac: 00:14:22:0c:e1:ba
-      ip: 172.16.7.81
+      ip: 172.17.0.31
     ib1:
       guid:
     eth0:
       mac: 00:14:22:0c:e1:ba
-      ip: 172.16.1.81
+      ip: 172.16.0.31
     eth1:
       mac:
-      ip: 192.168.133.81
+      ip: 172.16.3.31
 bordeplage-32:
   bios:
     version: A05
@@ -947,18 +947,18 @@ bordeplage-32:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98
-      ip: 192.168.132.32
+      ip: 172.18.0.32
     bmc:
       mac: 00:14:22:0c:da:b6
-      ip: 172.16.7.82
+      ip: 172.17.0.32
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99
     eth0:
       mac: 00:14:22:0c:da:b6
-      ip: 172.16.1.82
+      ip: 172.16.0.32
     eth1:
       mac: 00:14:22:0c:da:b7
-      ip: 192.168.133.82
+      ip: 172.16.3.32
 bordeplage-33:
   bios:
     version: A05
@@ -977,18 +977,18 @@ bordeplage-33:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76
-      ip: 192.168.132.33
+      ip: 172.18.0.33
     bmc:
       mac: 00:14:22:0c:da:94
-      ip: 172.16.7.83
+      ip: 172.17.0.33
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77
     eth0:
       mac: 00:14:22:0c:da:94
-      ip: 172.16.1.83
+      ip: 172.16.0.33
     eth1:
       mac: 00:14:22:0c:da:95
-      ip: 192.168.133.83
+      ip: 172.16.3.33
 bordeplage-34:
   bios:
     version: A05
@@ -1007,18 +1007,18 @@ bordeplage-34:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69
-      ip: 192.168.132.34
+      ip: 172.18.0.34
     bmc:
       mac: 00:14:22:0c:da:12
-      ip: 172.16.7.84
+      ip: 172.17.0.34
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a
     eth0:
       mac: 00:14:22:0c:da:12
-      ip: 172.16.1.84
+      ip: 172.16.0.34
     eth1:
       mac: 00:14:22:0c:da:13
-      ip: 192.168.133.84
+      ip: 172.16.3.34
 bordeplage-35:
   bios:
     version: A05
@@ -1037,18 +1037,18 @@ bordeplage-35:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37
-      ip: 192.168.132.35
+      ip: 172.18.0.35
     bmc:
       mac: 00:14:22:0c:e1:36
-      ip: 172.16.7.85
+      ip: 172.17.0.35
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38
     eth0:
       mac: 00:14:22:0c:e1:36
-      ip: 172.16.1.85
+      ip: 172.16.0.35
     eth1:
       mac: 00:14:22:0c:e1:37
-      ip: 192.168.133.85
+      ip: 172.16.3.35
 bordeplage-36:
   bios:
     version: A03
@@ -1067,18 +1067,18 @@ bordeplage-36:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22
-      ip: 192.168.132.36
+      ip: 172.18.0.36
     bmc:
       mac: 00:14:22:0c:e1:6a
-      ip: 172.16.7.86
+      ip: 172.17.0.36
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23
     eth0:
       mac: 00:14:22:0c:e1:6a
-      ip: 172.16.1.86
+      ip: 172.16.0.36
     eth1:
       mac: 00:14:22:0c:e1:6b
-      ip: 192.168.133.86
+      ip: 172.16.3.36
 bordeplage-37:
   bios:
     version: A05
@@ -1097,18 +1097,18 @@ bordeplage-37:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1
-      ip: 192.168.132.37
+      ip: 172.18.0.37
     bmc:
       mac: 00:14:22:0c:b1:7a
-      ip: 172.16.7.87
+      ip: 172.17.0.37
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2
     eth0:
       mac: 00:14:22:0c:b1:7a
-      ip: 172.16.1.87
+      ip: 172.16.0.37
     eth1:
       mac: 00:14:22:0c:b1:7b
-      ip: 192.168.133.87
+      ip: 172.16.3.37
 bordeplage-38:
   bios:
     version: A05
@@ -1127,18 +1127,18 @@ bordeplage-38:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1
-      ip: 192.168.132.38
+      ip: 172.18.0.38
     bmc:
       mac: 00:13:72:69:a8:b6
-      ip: 172.16.7.88
+      ip: 172.17.0.38
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2
     eth0:
       mac: 00:13:72:69:a8:b6
-      ip: 172.16.1.88
+      ip: 172.16.0.38
     eth1:
       mac: 00:13:72:69:a8:b7
-      ip: 192.168.133.88
+      ip: 172.16.3.38
 bordeplage-39:
   bios:
     version: A05
@@ -1157,18 +1157,18 @@ bordeplage-39:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05
-      ip: 192.168.132.39
+      ip: 172.18.0.39
     bmc:
       mac: 00:14:22:0c:da:7c
-      ip: 172.16.7.89
+      ip: 172.17.0.39
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06
     eth0:
       mac: 00:14:22:0c:da:7c
-      ip: 172.16.1.89
+      ip: 172.16.0.39
     eth1:
       mac: 00:14:22:0c:da:7d
-      ip: 192.168.133.89
+      ip: 172.16.3.39
 bordeplage-40:
   bios:
     version: A05
@@ -1187,18 +1187,18 @@ bordeplage-40:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f
-      ip: 192.168.132.40
+      ip: 172.18.0.40
     bmc:
       mac: 00:13:72:69:86:4c
-      ip: 172.16.7.90
+      ip: 172.17.0.40
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90
     eth0:
       mac: 00:13:72:69:86:4c
-      ip: 172.16.1.90
+      ip: 172.16.0.40
     eth1:
       mac: 00:13:72:69:86:4d
-      ip: 192.168.133.90
+      ip: 172.16.3.40
 bordeplage-41:
   bios:
     version: A03
@@ -1217,18 +1217,18 @@ bordeplage-41:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e
-      ip: 192.168.132.41
+      ip: 172.18.0.41
     bmc:
       mac: 00:14:22:0c:b3:92
-      ip: 172.16.7.91
+      ip: 172.17.0.41
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f
     eth0:
       mac: 00:14:22:0c:b3:92
-      ip: 172.16.1.91
+      ip: 172.16.0.41
     eth1:
       mac: 00:14:22:0c:b3:93
-      ip: 192.168.133.91
+      ip: 172.16.3.41
 bordeplage-42:
   bios:
     version: A05
@@ -1247,18 +1247,18 @@ bordeplage-42:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81
-      ip: 192.168.132.42
+      ip: 172.18.0.42
     bmc:
       mac: 00:14:22:0c:e1:a4
-      ip: 172.16.7.92
+      ip: 172.17.0.42
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82
     eth0:
       mac: 00:14:22:0c:e1:a4
-      ip: 172.16.1.92
+      ip: 172.16.0.42
     eth1:
       mac: 00:14:22:0c:e1:a5
-      ip: 192.168.133.92
+      ip: 172.16.3.42
 bordeplage-43:
   bios:
     version: A05
@@ -1277,18 +1277,18 @@ bordeplage-43:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75
-      ip: 192.168.132.43
+      ip: 172.18.0.43
     bmc:
       mac: 00:14:22:0c:da:8c
-      ip: 172.16.7.93
+      ip: 172.17.0.43
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76
     eth0:
       mac: 00:14:22:0c:da:8c
-      ip: 172.16.1.93
+      ip: 172.16.0.43
     eth1:
       mac: 00:14:22:0c:da:8d
-      ip: 192.168.133.93
+      ip: 172.16.3.43
 bordeplage-44:
   bios:
     version: A05
@@ -1307,18 +1307,18 @@ bordeplage-44:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92
-      ip: 192.168.132.44
+      ip: 172.18.0.44
     bmc:
       mac: 00:14:22:0c:b1:1c
-      ip: 172.16.7.94
+      ip: 172.17.0.44
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93
     eth0:
       mac: 00:14:22:0c:b1:1c
-      ip: 172.16.1.94
+      ip: 172.16.0.44
     eth1:
       mac: 00:14:22:0c:b1:1d
-      ip: 192.168.133.94
+      ip: 172.16.3.44
 bordeplage-45:
   bios:
     version: A03
@@ -1337,18 +1337,18 @@ bordeplage-45:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89
-      ip: 192.168.132.45
+      ip: 172.18.0.45
     bmc:
       mac: 00:14:22:0c:da:88
-      ip: 172.16.7.95
+      ip: 172.17.0.45
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a
     eth0:
       mac: 00:14:22:0c:da:88
-      ip: 172.16.1.95
+      ip: 172.16.0.45
     eth1:
       mac: 00:14:22:0c:da:89
-      ip: 192.168.133.95
+      ip: 172.16.3.45
 bordeplage-46:
   bios:
     version: A03
@@ -1367,18 +1367,18 @@ bordeplage-46:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62
-      ip: 192.168.132.46
+      ip: 172.18.0.46
     bmc:
       mac: 00:14:22:0c:e1:7c
-      ip: 172.16.7.96
+      ip: 172.17.0.46
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63
     eth0:
       mac: 00:14:22:0c:e1:7c
-      ip: 172.16.1.96
+      ip: 172.16.0.46
     eth1:
       mac: 00:14:22:0c:e1:7d
-      ip: 192.168.133.96
+      ip: 172.16.3.46
 bordeplage-47:
   bios:
     version: A05
@@ -1397,18 +1397,18 @@ bordeplage-47:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c
-      ip: 192.168.132.47
+      ip: 172.18.0.47
     bmc:
       mac: 00:14:22:0c:de:34
-      ip: 172.16.7.97
+      ip: 172.17.0.47
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d
     eth0:
       mac: 00:14:22:0c:de:34
-      ip: 172.16.1.97
+      ip: 172.16.0.47
     eth1:
       mac: 00:14:22:0c:de:35
-      ip: 192.168.133.97
+      ip: 172.16.3.47
 bordeplage-48:
   bios:
     version: A05
@@ -1427,18 +1427,18 @@ bordeplage-48:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59
-      ip: 192.168.132.48
+      ip: 172.18.0.48
     bmc:
       mac: 00:14:22:0c:db:ca
-      ip: 172.16.7.98
+      ip: 172.17.0.48
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a
     eth0:
       mac: 00:14:22:0c:db:ca
-      ip: 172.16.1.98
+      ip: 172.16.0.48
     eth1:
       mac: 00:14:22:0c:db:cb
-      ip: 192.168.133.98
+      ip: 172.16.3.48
 bordeplage-49:
   bios:
     version: A05
@@ -1457,18 +1457,18 @@ bordeplage-49:
   network_interfaces:
     ib0:
       guid:
-      ip: 192.168.132.49
+      ip: 172.18.0.49
     bmc:
       mac:
-      ip: 172.16.7.99
+      ip: 172.17.0.49
     ib1:
       guid:
     eth0:
       mac:
-      ip: 172.16.1.99
+      ip: 172.16.0.49
     eth1:
       mac:
-      ip: 192.168.133.99
+      ip: 172.16.3.49
 bordeplage-50:
   bios:
     version: A03
@@ -1487,18 +1487,18 @@ bordeplage-50:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32
-      ip: 192.168.132.50
+      ip: 172.18.0.50
     bmc:
       mac: 00:14:22:0c:da:a6
-      ip: 172.16.7.100
+      ip: 172.17.0.50
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33
     eth0:
       mac: 00:14:22:0c:da:a6
-      ip: 172.16.1.100
+      ip: 172.16.0.50
     eth1:
       mac: 00:14:22:0c:da:a7
-      ip: 192.168.133.100
+      ip: 172.16.3.50
 bordeplage-51:
   bios:
     version: A05
@@ -1517,15 +1517,15 @@ bordeplage-51:
   network_interfaces:
     ib0:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03
-      ip: 192.168.132.51
+      ip: 172.18.0.51
     bmc:
       mac: 00:14:22:0c:da:7e
-      ip: 172.16.7.101
+      ip: 172.17.0.51
     ib1:
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04
     eth0:
       mac: 00:14:22:0c:da:7e
-      ip: 172.16.1.101
+      ip: 172.16.0.51
     eth1:
       mac: 00:14:22:0c:da:7f
-      ip: 192.168.133.101
+      ip: 172.16.3.51
diff --git a/generators/input/bordeaux-bordereau.yaml b/generators/input/bordeaux-bordereau.yaml
index 4380a20dbd32b7ed8a3595a9b96e13103dd644f4..7ecfc47e389107fcfa4c80a8e13c2a461ec69240 100644
--- a/generators/input/bordeaux-bordereau.yaml
+++ b/generators/input/bordeaux-bordereau.yaml
@@ -17,13 +17,13 @@ bordereau-1:
   network_interfaces:
     bmc:
       mac:
-      ip: 172.16.7.103
+      ip: 172.17.4.1
     eth0:
       mac:
-      ip: 172.16.1.102
+      ip: 172.16.1.1
     eth1:
       mac:
-      ip: 192.168.133.102
+      ip: 172.16.4.1
 bordereau-2:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -42,13 +42,13 @@ bordereau-2:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:2e
-      ip: 172.16.7.104
+      ip: 172.17.4.2
     eth0:
       mac: 00:14:5e:55:5d:2c
-      ip: 172.16.1.103
+      ip: 172.16.1.2
     eth1:
       mac: 00:14:5e:55:5d:2d
-      ip: 192.168.133.103
+      ip: 172.16.4.2
 bordereau-3:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -67,13 +67,13 @@ bordereau-3:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:44
-      ip: 172.16.7.105
+      ip: 172.17.4.3
     eth0:
       mac: 00:14:5e:55:5c:42
-      ip: 172.16.1.104
+      ip: 172.16.1.3
     eth1:
       mac: 00:14:5e:55:5c:43
-      ip: 192.168.133.104
+      ip: 172.16.4.3
 bordereau-4:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -92,13 +92,13 @@ bordereau-4:
   network_interfaces:
     bmc:
       mac: 00:14:5E:55:68:C9
-      ip: 172.16.7.106
+      ip: 172.17.4.4
     eth0:
       mac: 00:14:5e:55:68:c7
-      ip: 172.16.1.105
+      ip: 172.16.1.4
     eth1:
       mac: 00:14:5e:55:68:c8
-      ip: 192.168.133.105
+      ip: 172.16.4.4
 bordereau-5:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -117,13 +117,13 @@ bordereau-5:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:61:96
-      ip: 172.16.7.107
+      ip: 172.17.4.5
     eth0:
       mac: 00:14:5e:55:61:94
-      ip: 172.16.1.106
+      ip: 172.16.1.5
     eth1:
       mac: 00:14:5e:55:61:95
-      ip: 192.168.133.106
+      ip: 172.16.4.5
 bordereau-6:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -142,13 +142,13 @@ bordereau-6:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:58:f0
-      ip: 172.16.7.108
+      ip: 172.17.4.6
     eth0:
       mac: 00:14:5e:55:58:ee
-      ip: 172.16.1.107
+      ip: 172.16.1.6
     eth1:
       mac: 00:14:5e:55:58:ef
-      ip: 192.168.133.107
+      ip: 172.16.4.6
 bordereau-7:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -167,13 +167,13 @@ bordereau-7:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:7e
-      ip: 172.16.7.109
+      ip: 172.17.4.7
     eth0:
       mac: 00:14:5e:55:5e:7c
-      ip: 172.16.1.108
+      ip: 172.16.1.7
     eth1:
       mac: 00:14:5e:55:5e:7d
-      ip: 192.168.133.108
+      ip: 172.16.4.7
 bordereau-8:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -192,13 +192,13 @@ bordereau-8:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:60:fa
-      ip: 172.16.7.110
+      ip: 172.17.4.8
     eth0:
       mac: 00:14:5e:55:60:f8
-      ip: 172.16.1.109
+      ip: 172.16.1.8
     eth1:
       mac: 00:14:5e:55:60:f9
-      ip: 192.168.133.109
+      ip: 172.16.4.8
 bordereau-9:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -217,13 +217,13 @@ bordereau-9:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:ea
-      ip: 172.16.7.111
+      ip: 172.17.4.9
     eth0:
       mac: 00:14:5e:55:5e:e8
-      ip: 172.16.1.110
+      ip: 172.16.1.9
     eth1:
       mac: 00:14:5e:55:5e:e9
-      ip: 192.168.133.110
+      ip: 172.16.4.9
 bordereau-10:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -242,13 +242,13 @@ bordereau-10:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6b:cc
-      ip: 172.16.7.112
+      ip: 172.17.4.10
     eth0:
       mac: 00:14:5e:55:6b:ca
-      ip: 172.16.1.111
+      ip: 172.16.1.10
     eth1:
       mac: 00:14:5e:55:6b:cb
-      ip: 192.168.133.111
+      ip: 172.16.4.10
 bordereau-11:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -267,13 +267,13 @@ bordereau-11:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:83
-      ip: 172.16.7.113
+      ip: 172.17.4.11
     eth0:
       mac: 00:14:5e:55:5c:81
-      ip: 172.16.1.112
+      ip: 172.16.1.11
     eth1:
       mac: 00:14:5e:55:5c:82
-      ip: 192.168.133.112
+      ip: 172.16.4.11
 bordereau-12:
   bios:
     version: 1.30-[C0E140AUS-1.40]-
@@ -292,13 +292,13 @@ bordereau-12:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:58:f9
-      ip: 172.16.7.114
+      ip: 172.17.4.12
     eth0:
       mac: 00:14:5e:55:58:f7
-      ip: 172.16.1.113
+      ip: 172.16.1.12
     eth1:
       mac: 00:14:5e:55:58:f8
-      ip: 192.168.133.113
+      ip: 172.16.4.12
 bordereau-13:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -317,13 +317,13 @@ bordereau-13:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:65
-      ip: 172.16.7.115
+      ip: 172.17.4.13
     eth0:
       mac: 00:14:5e:55:59:63
-      ip: 172.16.1.114
+      ip: 172.16.1.13
     eth1:
       mac: 00:14:5e:55:59:64
-      ip: 192.168.133.114
+      ip: 172.16.4.13
 bordereau-14:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -342,13 +342,13 @@ bordereau-14:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:5f
-      ip: 172.16.7.116
+      ip: 172.17.4.14
     eth0:
       mac: 00:14:5e:55:59:5d
-      ip: 172.16.1.115
+      ip: 172.16.1.14
     eth1:
       mac: 00:14:5e:55:59:5e
-      ip: 192.168.133.115
+      ip: 172.16.4.14
 bordereau-15:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -367,13 +367,13 @@ bordereau-15:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6a:f4
-      ip: 172.16.7.117
+      ip: 172.17.4.15
     eth0:
       mac: 00:14:5e:55:6a:f2
-      ip: 172.16.1.116
+      ip: 172.16.1.15
     eth1:
       mac: 00:14:5e:55:6a:f3
-      ip: 192.168.133.116
+      ip: 172.16.4.15
 bordereau-16:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -392,13 +392,13 @@ bordereau-16:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:ee
-      ip: 172.16.7.118
+      ip: 172.17.4.16
     eth0:
       mac: 00:14:5e:55:5d:ec
-      ip: 172.16.1.117
+      ip: 172.16.1.16
     eth1:
       mac: 00:14:5e:55:5d:ed
-      ip: 192.168.133.117
+      ip: 172.16.4.16
 bordereau-17:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -417,13 +417,13 @@ bordereau-17:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:ab
-      ip: 172.16.7.119
+      ip: 172.17.4.17
     eth0:
       mac: 00:14:5e:55:5e:a9
-      ip: 172.16.1.118
+      ip: 172.16.1.17
     eth1:
       mac: 00:14:5e:55:5e:aa
-      ip: 192.168.133.118
+      ip: 172.16.4.17
 bordereau-18:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -442,13 +442,13 @@ bordereau-18:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:64:0f
-      ip: 172.16.7.120
+      ip: 172.17.4.18
     eth0:
       mac: 00:14:5e:55:64:0d
-      ip: 172.16.1.119
+      ip: 172.16.1.18
     eth1:
       mac: 00:14:5e:55:64:0e
-      ip: 192.168.133.119
+      ip: 172.16.4.18
 bordereau-19:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -467,13 +467,13 @@ bordereau-19:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:68:69
-      ip: 172.16.7.121
+      ip: 172.17.4.19
     eth0:
       mac: 00:14:5e:55:68:67
-      ip: 172.16.1.120
+      ip: 172.16.1.19
     eth1:
       mac: 00:14:5e:55:68:68
-      ip: 192.168.133.120
+      ip: 172.16.4.19
 bordereau-20:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -492,13 +492,13 @@ bordereau-20:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:62:b3
-      ip: 172.16.7.122
+      ip: 172.17.4.20
     eth0:
       mac: 00:14:5e:55:62:b1
-      ip: 172.16.1.121
+      ip: 172.16.1.20
     eth1:
       mac: 00:14:5e:55:62:b2
-      ip: 192.168.133.121
+      ip: 172.16.4.20
 bordereau-21:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -517,13 +517,13 @@ bordereau-21:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5a:9a
-      ip: 172.16.7.123
+      ip: 172.17.4.21
     eth0:
       mac: 00:14:5e:55:5a:98
-      ip: 172.16.1.122
+      ip: 172.16.1.21
     eth1:
       mac: 00:14:5e:55:5a:99
-      ip: 192.168.133.122
+      ip: 172.16.4.21
 bordereau-22:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -542,13 +542,13 @@ bordereau-22:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:86
-      ip: 172.16.7.124
+      ip: 172.17.4.22
     eth0:
       mac: 00:14:5e:55:59:84
-      ip: 172.16.1.123
+      ip: 172.16.1.22
     eth1:
       mac: 00:14:5e:55:59:85
-      ip: 192.168.133.123
+      ip: 172.16.4.22
 bordereau-23:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -567,13 +567,13 @@ bordereau-23:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:62:98
-      ip: 172.16.7.125
+      ip: 172.17.4.23
     eth0:
       mac: 00:14:5e:55:62:96
-      ip: 172.16.1.124
+      ip: 172.16.1.23
     eth1:
       mac: 00:14:5e:55:62:97
-      ip: 192.168.133.124
+      ip: 172.16.4.23
 bordereau-24:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -592,13 +592,13 @@ bordereau-24:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:dc
-      ip: 172.16.7.126
+      ip: 172.17.4.24
     eth0:
       mac: 00:14:5e:55:5d:da
-      ip: 172.16.1.125
+      ip: 172.16.1.24
     eth1:
       mac: 00:14:5e:55:5d:db
-      ip: 192.168.133.125
+      ip: 172.16.4.24
 bordereau-25:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -617,13 +617,13 @@ bordereau-25:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:bb
-      ip: 172.16.7.127
+      ip: 172.17.4.25
     eth0:
       mac: 00:14:5e:55:5d:b9
-      ip: 172.16.1.126
+      ip: 172.16.1.25
     eth1:
       mac: 00:14:5e:55:5d:ba
-      ip: 192.168.133.126
+      ip: 172.16.4.25
 bordereau-26:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -642,13 +642,13 @@ bordereau-26:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6d:31
-      ip: 172.16.7.128
+      ip: 172.17.4.26
     eth0:
       mac: 00:14:5e:55:6d:2f
-      ip: 172.16.1.127
+      ip: 172.16.1.26
     eth1:
       mac: 00:14:5e:55:6d:30
-      ip: 192.168.133.127
+      ip: 172.16.4.26
 bordereau-27:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -667,13 +667,13 @@ bordereau-27:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:6b
-      ip: 172.16.7.129
+      ip: 172.17.4.27
     eth0:
       mac: 00:14:5e:55:5c:69
-      ip: 172.16.1.128
+      ip: 172.16.1.27
     eth1:
       mac: 00:14:5e:55:5c:6a
-      ip: 192.168.133.128
+      ip: 172.16.4.27
 bordereau-28:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -692,13 +692,13 @@ bordereau-28:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:8a
-      ip: 172.16.7.130
+      ip: 172.17.4.28
     eth0:
       mac: 00:14:5e:55:5e:88
-      ip: 172.16.1.129
+      ip: 172.16.1.28
     eth1:
       mac: 00:14:5e:55:5e:89
-      ip: 192.168.133.129
+      ip: 172.16.4.28
 bordereau-29:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -717,13 +717,13 @@ bordereau-29:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:c5
-      ip: 172.16.7.131
+      ip: 172.17.4.29
     eth0:
       mac: 00:14:5e:55:5c:c3
-      ip: 172.16.1.130
+      ip: 172.16.1.29
     eth1:
       mac: 00:14:5e:55:5c:c4
-      ip: 192.168.133.130
+      ip: 172.16.4.29
 bordereau-30:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -742,13 +742,13 @@ bordereau-30:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:d8
-      ip: 172.16.7.132
+      ip: 172.17.4.30
     eth0:
       mac: 00:14:5e:55:5e:d6
-      ip: 172.16.1.131
+      ip: 172.16.1.30
     eth1:
       mac: 00:14:5e:55:5e:d7
-      ip: 192.168.133.131
+      ip: 172.16.4.30
 bordereau-31:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -767,13 +767,13 @@ bordereau-31:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:b9
-      ip: 172.16.7.133
+      ip: 172.17.4.31
     eth0:
       mac: 00:14:5e:55:59:b7
-      ip: 172.16.1.132
+      ip: 172.16.1.31
     eth1:
       mac: 00:14:5e:55:59:b8
-      ip: 192.168.133.132
+      ip: 172.16.4.31
 bordereau-32:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -792,13 +792,13 @@ bordereau-32:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:bf
-      ip: 172.16.7.134
+      ip: 172.17.4.32
     eth0:
       mac: 00:14:5e:55:59:bd
-      ip: 172.16.1.133
+      ip: 172.16.1.32
     eth1:
       mac: 00:14:5e:55:59:be
-      ip: 192.168.133.133
+      ip: 172.16.4.32
 bordereau-33:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -817,13 +817,13 @@ bordereau-33:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:b4
-      ip: 172.16.7.135
+      ip: 172.17.4.33
     eth0:
       mac: 00:14:5e:55:5e:b2
-      ip: 172.16.1.134
+      ip: 172.16.1.33
     eth1:
       mac: 00:14:5e:55:5e:b3
-      ip: 192.168.133.134
+      ip: 172.16.4.33
 bordereau-34:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -842,13 +842,13 @@ bordereau-34:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:04
-      ip: 172.16.7.136
+      ip: 172.17.4.34
     eth0:
       mac: 00:14:5e:55:5d:02
-      ip: 172.16.1.135
+      ip: 172.16.1.34
     eth1:
       mac: 00:14:5e:55:5d:03
-      ip: 192.168.133.135
+      ip: 172.16.4.34
 bordereau-35:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -867,13 +867,13 @@ bordereau-35:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:24
-      ip: 172.16.7.137
+      ip: 172.17.4.35
     eth0:
       mac: 00:14:5e:55:5e:22
-      ip: 172.16.1.136
+      ip: 172.16.1.35
     eth1:
       mac: 00:14:5e:55:5e:23
-      ip: 192.168.133.136
+      ip: 172.16.4.35
 bordereau-36:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -892,13 +892,13 @@ bordereau-36:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:69:f2
-      ip: 172.16.7.138
+      ip: 172.17.4.36
     eth0:
       mac: 00:14:5e:55:69:f0
-      ip: 172.16.1.137
+      ip: 172.16.1.36
     eth1:
       mac: 00:14:5e:55:69:f1
-      ip: 192.168.133.137
+      ip: 172.16.4.36
 bordereau-37:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -917,13 +917,13 @@ bordereau-37:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5f:d4
-      ip: 172.16.7.139
+      ip: 172.17.4.37
     eth0:
       mac: 00:14:5e:55:5f:d2
-      ip: 172.16.1.138
+      ip: 172.16.1.37
     eth1:
       mac: 00:14:5e:55:5f:d3
-      ip: 192.168.133.138
+      ip: 172.16.4.37
 bordereau-38:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -942,13 +942,13 @@ bordereau-38:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5f:11
-      ip: 172.16.7.140
+      ip: 172.17.4.38
     eth0:
       mac: 00:14:5e:55:5f:0f
-      ip: 172.16.1.139
+      ip: 172.16.1.38
     eth1:
       mac: 00:14:5e:55:5f:10
-      ip: 192.168.133.139
+      ip: 172.16.4.38
 bordereau-39:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -967,13 +967,13 @@ bordereau-39:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:31
-      ip: 172.16.7.141
+      ip: 172.17.4.39
     eth0:
       mac: 00:14:5e:55:63:2f
-      ip: 172.16.1.140
+      ip: 172.16.1.39
     eth1:
       mac: 00:14:5e:55:63:30
-      ip: 192.168.133.140
+      ip: 172.16.4.39
 bordereau-40:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -992,13 +992,13 @@ bordereau-40:
   network_interfaces:
     bmc:
       mac:
-      ip: 172.16.7.142
+      ip: 172.17.4.40
     eth0:
       mac:
-      ip: 172.16.1.141
+      ip: 172.16.1.40
     eth1:
       mac:
-      ip: 192.168.133.141
+      ip: 172.16.4.40
 bordereau-41:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1017,13 +1017,13 @@ bordereau-41:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:02
-      ip: 172.16.7.143
+      ip: 172.17.4.41
     eth0:
       mac: 00:14:5e:55:59:00
-      ip: 172.16.1.142
+      ip: 172.16.1.41
     eth1:
       mac: 00:14:5e:55:59:01
-      ip: 192.168.133.142
+      ip: 172.16.4.41
 bordereau-42:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1042,13 +1042,13 @@ bordereau-42:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:60:97
-      ip: 172.16.7.144
+      ip: 172.17.4.42
     eth0:
       mac: 00:14:5e:55:60:95
-      ip: 172.16.1.143
+      ip: 172.16.1.42
     eth1:
       mac: 00:14:5e:55:60:96
-      ip: 192.168.133.143
+      ip: 172.16.4.42
 bordereau-43:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1067,13 +1067,13 @@ bordereau-43:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6c:02
-      ip: 172.16.7.145
+      ip: 172.17.4.43
     eth0:
       mac: 00:14:5e:55:6c:00
-      ip: 172.16.1.144
+      ip: 172.16.1.43
     eth1:
       mac: 00:14:5e:55:6c:01
-      ip: 192.168.133.144
+      ip: 172.16.4.43
 bordereau-44:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1092,13 +1092,13 @@ bordereau-44:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:d4
-      ip: 172.16.7.146
+      ip: 172.17.4.44
     eth0:
       mac: 00:14:5e:55:59:d2
-      ip: 172.16.1.145
+      ip: 172.16.1.44
     eth1:
       mac: 00:14:5e:55:59:d3
-      ip: 192.168.133.145
+      ip: 172.16.4.44
 bordereau-45:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1117,13 +1117,13 @@ bordereau-45:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:bf
-      ip: 172.16.7.147
+      ip: 172.17.4.45
     eth0:
       mac: 00:14:5e:55:5c:bd
-      ip: 172.16.1.146
+      ip: 172.16.1.45
     eth1:
       mac: 00:14:5e:55:5c:be
-      ip: 192.168.133.146
+      ip: 172.16.4.45
 bordereau-46:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1142,13 +1142,13 @@ bordereau-46:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:62
-      ip: 172.16.7.148
+      ip: 172.17.4.46
     eth0:
       mac: 00:14:5e:55:5c:60
-      ip: 172.16.1.147
+      ip: 172.16.1.46
     eth1:
       mac: 00:14:5e:55:5c:61
-      ip: 192.168.133.147
+      ip: 172.16.4.46
 bordereau-47:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1167,13 +1167,13 @@ bordereau-47:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6c:aa
-      ip: 172.16.7.149
+      ip: 172.17.4.47
     eth0:
       mac: 00:14:5e:55:6c:a8
-      ip: 172.16.1.148
+      ip: 172.16.1.47
     eth1:
       mac: 00:14:5e:55:6c:a9
-      ip: 192.168.133.148
+      ip: 172.16.4.47
 bordereau-48:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1192,13 +1192,13 @@ bordereau-48:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:58:ff
-      ip: 172.16.7.150
+      ip: 172.17.4.48
     eth0:
       mac: 00:14:5e:55:58:fd
-      ip: 172.16.1.149
+      ip: 172.16.1.48
     eth1:
       mac: 00:14:5e:55:58:fe
-      ip: 192.168.133.149
+      ip: 172.16.4.48
 bordereau-49:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1217,13 +1217,13 @@ bordereau-49:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:62:d9
-      ip: 172.16.7.151
+      ip: 172.17.4.49
     eth0:
       mac: 00:14:5e:55:62:e7
-      ip: 172.16.1.150
+      ip: 172.16.1.49
     eth1:
       mac: 00:14:5e:55:62:e8
-      ip: 192.168.133.150
+      ip: 172.16.4.49
 bordereau-50:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1242,13 +1242,13 @@ bordereau-50:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:ae
-      ip: 172.16.7.152
+      ip: 172.17.4.50
     eth0:
       mac: 00:14:5e:55:5e:ac
-      ip: 172.16.1.151
+      ip: 172.16.1.50
     eth1:
       mac: 00:14:5e:55:5e:ad
-      ip: 192.168.133.151
+      ip: 172.16.4.50
 bordereau-51:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1267,13 +1267,13 @@ bordereau-51:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:d7
-      ip: 172.16.7.153
+      ip: 172.17.4.51
     eth0:
       mac: 00:14:5e:55:5c:d5
-      ip: 172.16.1.152
+      ip: 172.16.1.51
     eth1:
       mac: 00:14:5e:55:5c:d6
-      ip: 192.168.133.152
+      ip: 172.16.4.51
 bordereau-52:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1292,13 +1292,13 @@ bordereau-52:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:b5
-      ip: 172.16.7.154
+      ip: 172.17.4.52
     eth0:
       mac: 00:14:5e:55:5d:b3
-      ip: 172.16.1.153
+      ip: 172.16.1.52
     eth1:
       mac: 00:14:5e:55:5d:b4
-      ip: 192.168.133.153
+      ip: 172.16.4.52
 bordereau-53:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1317,13 +1317,13 @@ bordereau-53:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6c:1d
-      ip: 172.16.7.155
+      ip: 172.17.4.53
     eth0:
       mac: 00:14:5e:55:6c:1b
-      ip: 172.16.1.154
+      ip: 172.16.1.53
     eth1:
       mac: 00:14:5e:55:6c:1c
-      ip: 192.168.133.154
+      ip: 172.16.4.53
 bordereau-54:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1342,13 +1342,13 @@ bordereau-54:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:b8
-      ip: 172.16.7.156
+      ip: 172.17.4.54
     eth0:
       mac: 00:14:5e:55:63:b6
-      ip: 172.16.1.155
+      ip: 172.16.1.54
     eth1:
       mac: 00:14:5e:55:63:b7
-      ip: 192.168.133.155
+      ip: 172.16.4.54
 bordereau-55:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1367,13 +1367,13 @@ bordereau-55:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:ef
-      ip: 172.16.7.157
+      ip: 172.17.4.55
     eth0:
       mac: 00:14:5e:55:5c:ed
-      ip: 172.16.1.156
+      ip: 172.16.1.55
     eth1:
       mac: 00:14:5e:55:5c:ee
-      ip: 192.168.133.156
+      ip: 172.16.4.55
 bordereau-56:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1392,13 +1392,13 @@ bordereau-56:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:60:cd
-      ip: 172.16.7.158
+      ip: 172.17.4.56
     eth0:
       mac: 00:14:5e:55:60:cb
-      ip: 172.16.1.157
+      ip: 172.16.1.56
     eth1:
       mac: 00:14:5e:55:60:cc
-      ip: 192.168.133.157
+      ip: 172.16.4.56
 bordereau-57:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1417,13 +1417,13 @@ bordereau-57:
   network_interfaces:
     bmc:
       mac:
-      ip: 172.16.7.159
+      ip: 172.17.4.57
     eth0:
       mac:
-      ip: 172.16.1.158
+      ip: 172.16.1.57
     eth1:
       mac:
-      ip: 192.168.133.158
+      ip: 172.16.4.57
 bordereau-58:
   bios:
     version: 1.35-[C0E135AUS-1.35]-
@@ -1442,13 +1442,13 @@ bordereau-58:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:a8
-      ip: 172.16.7.160
+      ip: 172.17.4.58
     eth0:
       mac: 00:14:5e:55:5e:a6
-      ip: 172.16.1.159
+      ip: 172.16.1.58
     eth1:
       mac: 00:14:5e:55:5e:a7
-      ip: 192.168.133.159
+      ip: 172.16.4.58
 bordereau-59:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1467,13 +1467,13 @@ bordereau-59:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:da
-      ip: 172.16.7.161
+      ip: 172.17.4.59
     eth0:
       mac: 00:14:5e:55:5c:d8
-      ip: 172.16.1.160
+      ip: 172.16.1.59
     eth1:
       mac: 00:14:5e:55:5c:d9
-      ip: 192.168.133.160
+      ip: 172.16.4.59
 bordereau-60:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1492,13 +1492,13 @@ bordereau-60:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5b:5d
-      ip: 172.16.7.162
+      ip: 172.17.4.60
     eth0:
       mac: 00:14:5e:55:5b:5b
-      ip: 172.16.1.161
+      ip: 172.16.1.60
     eth1:
       mac: 00:14:5e:55:5b:5c
-      ip: 192.168.133.161
+      ip: 172.16.4.60
 bordereau-61:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1517,13 +1517,13 @@ bordereau-61:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:58:4b
-      ip: 172.16.7.163
+      ip: 172.17.4.61
     eth0:
       mac: 00:14:5e:55:58:49
-      ip: 172.16.1.162
+      ip: 172.16.1.61
     eth1:
       mac: 00:14:5e:55:58:4a
-      ip: 192.168.133.162
+      ip: 172.16.4.61
 bordereau-62:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1542,13 +1542,13 @@ bordereau-62:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:28
-      ip: 172.16.7.164
+      ip: 172.17.4.62
     eth0:
       mac: 00:14:5e:55:63:26
-      ip: 172.16.1.163
+      ip: 172.16.1.62
     eth1:
       mac: 00:14:5e:55:63:27
-      ip: 192.168.133.163
+      ip: 172.16.4.62
 bordereau-63:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1567,13 +1567,13 @@ bordereau-63:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:6e
-      ip: 172.16.7.165
+      ip: 172.17.4.63
     eth0:
       mac: 00:14:5e:55:5c:6c
-      ip: 172.16.1.164
+      ip: 172.16.1.63
     eth1:
       mac: 00:14:5e:55:5c:6d
-      ip: 192.168.133.164
+      ip: 172.16.4.63
 bordereau-64:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1592,13 +1592,13 @@ bordereau-64:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:d1
-      ip: 172.16.7.166
+      ip: 172.17.4.64
     eth0:
       mac: 00:14:5e:55:5c:cf
-      ip: 172.16.1.165
+      ip: 172.16.1.64
     eth1:
       mac: 00:14:5e:55:5c:d0
-      ip: 192.168.133.165
+      ip: 172.16.4.64
 bordereau-65:
   bios:
     version: 1.35-[C0E135AUS-1.35]-
@@ -1617,13 +1617,13 @@ bordereau-65:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:fb
-      ip: 172.16.7.167
+      ip: 172.17.4.65
     eth0:
       mac: 00:14:5e:55:59:f9
-      ip: 172.16.1.166
+      ip: 172.16.1.65
     eth1:
       mac: 00:14:5e:55:59:fa
-      ip: 192.168.133.166
+      ip: 172.16.4.65
 bordereau-66:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1642,13 +1642,13 @@ bordereau-66:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:1b
-      ip: 172.16.7.168
+      ip: 172.17.4.66
     eth0:
       mac: 00:14:5e:55:5e:19
-      ip: 172.16.1.167
+      ip: 172.16.1.66
     eth1:
       mac: 00:14:5e:55:5e:1a
-      ip: 192.168.133.167
+      ip: 172.16.4.66
 bordereau-67:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1667,13 +1667,13 @@ bordereau-67:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:1d
-      ip: 172.16.7.169
+      ip: 172.17.4.67
     eth0:
       mac: 00:14:5e:55:5c:1b
-      ip: 172.16.1.168
+      ip: 172.16.1.67
     eth1:
       mac: 00:14:5e:55:5c:1c
-      ip: 192.168.133.168
+      ip: 172.16.4.67
 bordereau-68:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1692,13 +1692,13 @@ bordereau-68:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:57:8b
-      ip: 172.16.7.170
+      ip: 172.17.4.68
     eth0:
       mac: 00:14:5e:55:57:89
-      ip: 172.16.1.169
+      ip: 172.16.1.68
     eth1:
       mac: 00:14:5e:55:57:8a
-      ip: 192.168.133.169
+      ip: 172.16.4.68
 bordereau-69:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1717,13 +1717,13 @@ bordereau-69:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:d0
-      ip: 172.16.7.171
+      ip: 172.17.4.69
     eth0:
       mac: 00:14:5e:55:63:ce
-      ip: 172.16.1.170
+      ip: 172.16.1.69
     eth1:
       mac: 00:14:5e:55:63:cf
-      ip: 192.168.133.170
+      ip: 172.16.4.69
 bordereau-70:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1742,13 +1742,13 @@ bordereau-70:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6b:00
-      ip: 172.16.7.172
+      ip: 172.17.4.70
     eth0:
       mac: 00:14:5e:55:6a:fe
-      ip: 172.16.1.171
+      ip: 172.16.1.70
     eth1:
       mac: 00:14:5e:55:6a:ff
-      ip: 192.168.133.171
+      ip: 172.16.4.70
 bordereau-71:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1767,13 +1767,13 @@ bordereau-71:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:46
-      ip: 172.16.7.173
+      ip: 172.17.4.71
     eth0:
       mac: 00:14:5e:55:59:44
-      ip: 172.16.1.172
+      ip: 172.16.1.71
     eth1:
       mac: 00:14:5e:55:59:45
-      ip: 192.168.133.172
+      ip: 172.16.4.71
 bordereau-72:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1792,13 +1792,13 @@ bordereau-72:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5a:40
-      ip: 172.16.7.174
+      ip: 172.17.4.72
     eth0:
       mac: 00:14:5e:55:5a:3e
-      ip: 172.16.1.173
+      ip: 172.16.1.72
     eth1:
       mac: 00:14:5e:55:5a:3f
-      ip: 192.168.133.173
+      ip: 172.16.4.72
 bordereau-73:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1817,13 +1817,13 @@ bordereau-73:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6a:1c
-      ip: 172.16.7.175
+      ip: 172.17.4.73
     eth0:
       mac: 00:14:5e:55:6a:1a
-      ip: 172.16.1.174
+      ip: 172.16.1.73
     eth1:
       mac: 00:14:5e:55:6a:1b
-      ip: 192.168.133.174
+      ip: 172.16.4.73
 bordereau-74:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1842,13 +1842,13 @@ bordereau-74:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:64:06
-      ip: 172.16.7.176
+      ip: 172.17.4.74
     eth0:
       mac: 00:14:5e:55:64:04
-      ip: 172.16.1.175
+      ip: 172.16.1.74
     eth1:
       mac: 00:14:5e:55:64:05
-      ip: 192.168.133.175
+      ip: 172.16.4.74
 bordereau-75:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1867,13 +1867,13 @@ bordereau-75:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:b1
-      ip: 172.16.7.177
+      ip: 172.17.4.75
     eth0:
       mac: 00:14:5e:55:5e:af
-      ip: 172.16.1.176
+      ip: 172.16.1.75
     eth1:
       mac: 00:14:5e:55:5e:b0
-      ip: 192.168.133.176
+      ip: 172.16.4.75
 bordereau-76:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1892,13 +1892,13 @@ bordereau-76:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:0a
-      ip: 172.16.7.178
+      ip: 172.17.4.76
     eth0:
       mac: 00:14:5e:55:5d:08
-      ip: 172.16.1.177
+      ip: 172.16.1.76
     eth1:
       mac: 00:14:5e:55:5d:09
-      ip: 192.168.133.177
+      ip: 172.16.4.76
 bordereau-77:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1917,13 +1917,13 @@ bordereau-77:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:61
-      ip: 172.16.7.179
+      ip: 172.17.4.77
     eth0:
       mac: 00:14:5e:55:63:5f
-      ip: 172.16.1.178
+      ip: 172.16.1.77
     eth1:
       mac: 00:14:5e:55:63:60
-      ip: 192.168.133.178
+      ip: 172.16.4.77
 bordereau-78:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1942,13 +1942,13 @@ bordereau-78:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:63:fd
-      ip: 172.16.7.180
+      ip: 172.17.4.78
     eth0:
       mac: 00:14:5e:55:63:fb
-      ip: 172.16.1.179
+      ip: 172.16.1.78
     eth1:
       mac: 00:14:5e:55:63:fc
-      ip: 192.168.133.179
+      ip: 172.16.4.78
 bordereau-79:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1967,13 +1967,13 @@ bordereau-79:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:62:ef
-      ip: 172.16.7.181
+      ip: 172.17.4.79
     eth0:
       mac: 00:14:5e:55:62:ed
-      ip: 172.16.1.180
+      ip: 172.16.1.79
     eth1:
       mac: 00:14:5e:55:62:ee
-      ip: 192.168.133.180
+      ip: 172.16.4.79
 bordereau-80:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1992,13 +1992,13 @@ bordereau-80:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:b0
-      ip: 172.16.7.182
+      ip: 172.17.1.80
     eth0:
       mac: 00:14:5e:55:5c:ae
-      ip: 172.16.1.181
+      ip: 172.16.1.80
     eth1:
       mac: 00:14:5e:55:5c:af
-      ip: 192.168.133.181
+      ip: 172.16.4.80
 bordereau-81:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -2017,13 +2017,13 @@ bordereau-81:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:58:a8
-      ip: 172.16.7.183
+      ip: 172.17.1.81
     eth0:
       mac: 00:14:5e:55:58:a6
-      ip: 172.16.1.182
+      ip: 172.16.1.81
     eth1:
       mac: 00:14:5e:55:58:a7
-      ip: 192.168.133.182
+      ip: 172.16.4.81
 bordereau-82:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2042,13 +2042,13 @@ bordereau-82:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:68:87
-      ip: 172.16.7.184
+      ip: 172.17.1.82
     eth0:
       mac: 00:14:5e:55:68:85
-      ip: 172.16.1.183
+      ip: 172.16.1.82
     eth1:
       mac: 00:14:5e:55:68:86
-      ip: 192.168.133.183
+      ip: 172.16.4.82
 bordereau-83:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2067,13 +2067,13 @@ bordereau-83:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6d:25
-      ip: 172.16.7.185
+      ip: 172.17.1.83
     eth0:
       mac: 00:14:5e:55:6d:23
-      ip: 172.16.1.184
+      ip: 172.16.1.83
     eth1:
       mac: 00:14:5e:55:6d:24
-      ip: 192.168.133.184
+      ip: 172.16.4.83
 bordereau-84:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2092,13 +2092,13 @@ bordereau-84:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:4a
-      ip: 172.16.7.186
+      ip: 172.17.1.84
     eth0:
       mac: 00:14:5e:55:5c:48
-      ip: 172.16.1.185
+      ip: 172.16.1.84
     eth1:
       mac: 00:14:5e:55:5c:49
-      ip: 192.168.133.185
+      ip: 172.16.4.84
 bordereau-85:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2117,13 +2117,13 @@ bordereau-85:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:59:43
-      ip: 172.16.7.187
+      ip: 172.17.1.85
     eth0:
       mac: 00:14:5e:55:59:41
-      ip: 172.16.1.186
+      ip: 172.16.1.85
     eth1:
       mac: 00:14:5e:55:59:42
-      ip: 192.168.133.186
+      ip: 172.16.4.85
 bordereau-86:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2142,13 +2142,13 @@ bordereau-86:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:68:cc
-      ip: 172.16.7.188
+      ip: 172.17.1.86
     eth0:
       mac: 00:14:5e:55:68:ca
-      ip: 172.16.1.187
+      ip: 172.16.1.86
     eth1:
       mac: 00:14:5e:55:68:cb
-      ip: 192.168.133.187
+      ip: 172.16.4.86
 bordereau-87:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2167,13 +2167,13 @@ bordereau-87:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5e:2a
-      ip: 172.16.7.189
+      ip: 172.17.1.87
     eth0:
       mac: 00:14:5e:55:5e:28
-      ip: 172.16.1.188
+      ip: 172.16.1.87
     eth1:
       mac: 00:14:5e:55:5e:29
-      ip: 192.168.133.188
+      ip: 172.16.4.87
 bordereau-88:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2192,13 +2192,13 @@ bordereau-88:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5d:6d
-      ip: 172.16.7.190
+      ip: 172.17.1.88
     eth0:
       mac: 00:14:5e:55:5d:6b
-      ip: 172.16.1.189
+      ip: 172.16.1.88
     eth1:
       mac: 00:14:5e:55:5d:6c
-      ip: 192.168.133.189
+      ip: 172.16.4.88
 bordereau-89:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2217,13 +2217,13 @@ bordereau-89:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6d:07
-      ip: 172.16.7.191
+      ip: 172.17.1.89
     eth0:
       mac: 00:14:5e:55:6d:05
-      ip: 172.16.1.190
+      ip: 172.16.1.89
     eth1:
       mac: 00:14:5e:55:6d:06
-      ip: 192.168.133.190
+      ip: 172.16.4.89
 bordereau-90:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -2242,13 +2242,13 @@ bordereau-90:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6d:2b
-      ip: 172.16.7.192
+      ip: 172.17.1.90
     eth0:
       mac: 00:14:5e:55:6d:29
-      ip: 172.16.1.191
+      ip: 172.16.1.90
     eth1:
       mac: 00:14:5e:55:6d:2a
-      ip: 192.168.133.191
+      ip: 172.16.4.90
 bordereau-91:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2267,13 +2267,13 @@ bordereau-91:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:5c:c8
-      ip: 172.16.7.193
+      ip: 172.17.1.91
     eth0:
       mac: 00:14:5e:55:5c:c6
-      ip: 172.16.1.192
+      ip: 172.16.1.91
     eth1:
       mac: 00:14:5e:55:5c:c7
-      ip: 192.168.133.192
+      ip: 172.16.4.91
 bordereau-92:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2292,13 +2292,13 @@ bordereau-92:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6a:4c
-      ip: 172.16.7.194
+      ip: 172.17.1.92
     eth0:
       mac: 00:14:5e:55:6a:4a
-      ip: 172.16.1.193
+      ip: 172.16.1.92
     eth1:
       mac: 00:14:5e:55:6a:4b
-      ip: 192.168.133.193
+      ip: 172.16.4.92
 bordereau-93:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2317,10 +2317,10 @@ bordereau-93:
   network_interfaces:
     bmc:
       mac: 00:14:5e:55:6d:16
-      ip: 172.16.7.195
+      ip: 172.17.1.93
     eth0:
       mac: 00:14:5e:55:6d:14
-      ip: 172.16.1.194
+      ip: 172.16.1.93
     eth1:
       mac: 00:14:5e:55:6d:15
-      ip: 192.168.133.194
+      ip: 172.16.4.93
diff --git a/generators/input/bordeaux-borderline.yaml b/generators/input/bordeaux-borderline.yaml
index cf5ed61bb5119bbce5c9247bc567e16592210f25..8833efe9e4b2b545031d996d89f7cd0b3b11f14b 100644
--- a/generators/input/bordeaux-borderline.yaml
+++ b/generators/input/bordeaux-borderline.yaml
@@ -13,21 +13,21 @@ borderline-1:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d
-      ip: 172.16.4.196
+      ip: 172.18.2.1
     bmc:
       mac: 00:14:5e:57:67:06
-      ip: 172.16.7.242
+      ip: 172.17.2.1
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e
     myri0:
       mac: 00:60:dd:47:b6:e9
-      ip: 172.16.3.196
+      ip: 172.18.2.1
     eth0:
       mac: 00:14:5e:57:67:04
-      ip: 172.16.1.196
+      ip: 172.16.2.1
     eth1:
       mac: 00:14:5e:57:67:02
-      ip: 192.168.133.196
+      ip: 172.16.5.1
   chassis:
     serial_number: 99A3249
     manufacturer: IBM
@@ -46,21 +46,21 @@ borderline-2:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85
-      ip: 172.16.4.197
+      ip: 172.18.2.2
     bmc:
       mac: 00:14:5e:57:cc:40
-      ip: 172.16.7.243
+      ip: 172.17.2.2
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86
     myri0:
       mac: 00:60:dd:47:b6:7a
-      ip: 172.16.3.197
+      ip: 172.18.2.2
     eth0:
       mac: 00:14:5e:57:cc:3e
-      ip: 172.16.1.197
+      ip: 172.16.2.2
     eth1:
       mac: 00:14:5e:57:cc:3c
-      ip: 192.168.133.197
+      ip: 172.16.5.2
   chassis:
     serial_number: 99A3255
     manufacturer: IBM
@@ -79,21 +79,21 @@ borderline-3:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed
-      ip: 172.16.4.198
+      ip: 172.18.2.3
     bmc:
       mac: 00:14:5e:57:6d:a2
-      ip: 172.16.7.244
+      ip: 172.17.2.3
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee
     myri0:
       mac: 00:60:dd:47:b5:69
-      ip: 172.16.3.198
+      ip: 172.18.2.3
     eth0:
       mac: 00:14:5e:57:6d:a0
-      ip: 172.16.1.198
+      ip: 172.16.2.3
     eth1:
       mac: 00:14:5e:57:6d:9e
-      ip: 192.168.133.198
+      ip: 172.16.5.3
   chassis:
     serial_number: 99A3248
     manufacturer: IBM
@@ -112,21 +112,21 @@ borderline-4:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85
-      ip: 172.16.4.199
+      ip: 172.18.2.4
     bmc:
       mac: 00:14:5e:57:c4:d2
-      ip: 172.16.7.245
+      ip: 172.17.2.4
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86
     myri0:
       mac: 00:60:dd:47:b7:6e
-      ip: 172.16.3.199
+      ip: 172.18.2.4
     eth0:
       mac: 00:14:5e:57:c4:d0
-      ip: 172.16.1.199
+      ip: 172.16.2.4
     eth1:
       mac: 00:14:5e:57:c4:ce
-      ip: 192.168.133.199
+      ip: 172.16.5.4
   chassis:
     serial_number: 99A3252
     manufacturer: IBM
@@ -145,21 +145,21 @@ borderline-5:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d
-      ip: 172.16.4.200
+      ip: 172.18.2.5
     bmc:
       mac: 00:14:5e:57:6d:48
-      ip: 172.16.7.246
+      ip: 172.17.2.5
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e
     myri0:
       mac: 00:60:dd:47:b6:50
-      ip: 172.16.3.200
+      ip: 172.18.2.5
     eth0:
       mac: 00:14:5e:57:6d:46
-      ip: 172.16.1.200
+      ip: 172.16.2.5
     eth1:
       mac: 00:14:5e:57:6d:44
-      ip: 192.168.133.200
+      ip: 172.16.5.5
   chassis:
     serial_number: 99A3257
     manufacturer: IBM
@@ -178,21 +178,21 @@ borderline-6:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d
-      ip: 172.16.4.201
+      ip: 172.18.2.6
     bmc:
       mac: 00:14:5e:57:82:a8
-      ip: 172.16.7.247
+      ip: 172.17.2.6
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e
     myri0:
       mac: 00:60:dd:47:b6:7d
-      ip: 172.16.3.201
+      ip: 172.18.2.6
     eth0:
       mac: 00:14:5e:57:82:a6
-      ip: 172.16.1.201
+      ip: 172.16.2.6
     eth1:
       mac: 00:14:5e:57:82:a4
-      ip: 192.168.133.201
+      ip: 172.16.5.6
   chassis:
     serial_number: 99A3256
     manufacturer: IBM
@@ -211,21 +211,21 @@ borderline-7:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d
-      ip: 172.16.4.202
+      ip: 172.18.2.7
     bmc:
       mac: 00:14:5e:57:cc:04
-      ip: 172.16.7.248
+      ip: 172.17.2.7
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e
     myri0:
       mac: 00:60:dd:47:86:96
-      ip: 172.16.3.202
+      ip: 172.18.2.7
     eth0:
       mac: 00:14:5e:57:cc:02
-      ip: 172.16.1.202
+      ip: 172.16.2.7
     eth1:
       mac: 00:14:5e:57:cc:00
-      ip: 192.168.133.202
+      ip: 172.16.5.7
   chassis:
     serial_number: 99A3251
     manufacturer: IBM
@@ -244,21 +244,21 @@ borderline-8:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49
-      ip: 172.16.4.203
+      ip: 172.18.2.8
     bmc:
       mac: 00:14:5e:57:cb:da
-      ip: 172.16.7.249
+      ip: 172.17.2.8
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a
     myri0:
       mac: 00:60:dd:47:b5:14
-      ip: 172.16.3.203
+      ip: 172.18.2.8
     eth0:
       mac: 00:14:5e:57:cb:d8
-      ip: 172.16.1.203
+      ip: 172.16.2.8
     eth1:
       mac: 00:14:5e:57:cb:d6
-      ip: 192.168.133.203
+      ip: 172.16.5.8
   chassis:
     serial_number: 99A3250
     manufacturer: IBM
@@ -277,21 +277,21 @@ borderline-9:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85
-      ip: 172.16.4.204
+      ip: 172.18.2.9
     bmc:
       mac: 00:14:5e:57:cb:b0
-      ip: 172.16.7.250
+      ip: 172.17.2.9
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86
     myri0:
       mac: 00:60:dd:47:7d:8c
-      ip: 172.16.3.204
+      ip: 172.18.2.9
     eth0:
       mac: 00:14:5e:57:cb:ae
-      ip: 172.16.1.204
+      ip: 172.16.2.9
     eth1:
       mac: 00:14:5e:57:cb:ac
-      ip: 192.168.133.204
+      ip: 172.16.5.9
   chassis:
     serial_number: 99A3253
     manufacturer: IBM
@@ -310,21 +310,21 @@ borderline-10:
   network_interfaces:
     ib0:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd
-      ip: 172.16.4.205
+      ip: 172.18.2.10
     bmc:
       mac: 00:14:5e:57:cb:f8
-      ip: 172.16.7.251
+      ip: 172.17.2.10
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe
     myri0:
       mac: 00:60:dd:47:b7:28
-      ip: 172.16.3.205
+      ip: 172.18.2.10
     eth0:
       mac: 00:14:5e:57:cb:f6
-      ip: 172.16.1.205
+      ip: 172.16.2.10
     eth1:
       mac: 00:14:5e:57:cb:f4
-      ip: 192.168.133.205
+      ip: 172.16.5.10
   chassis:
     serial_number: 99A3258
     manufacturer: IBM