diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index 46e3f001db02c5ae5f4d81b8ecdefdbf8397e8a9..215215774bf4ed2608594645b55422c5a2a1a6ca 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -23386,7 +23386,6 @@
"firmware_version": "16.26.4012",
"guid": "0x98039b03009266da",
"interface": "InfiniBand",
- "ip": "172.18.53.1",
"kavlan": false,
"mac": "98:03:9b:03:00:92:66:da",
"management": false,
@@ -23822,7 +23821,6 @@
"firmware_version": "16.26.4012",
"guid": "0x98039b03009a4a4e",
"interface": "InfiniBand",
- "ip": "172.18.53.2",
"kavlan": false,
"mac": "98:03:9b:03:00:9a:4a:4e",
"management": false,
@@ -32799,7 +32797,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f6f6",
"interface": "InfiniBand",
- "ip": "172.18.54.1",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f6:f6",
"management": false,
@@ -33009,7 +33006,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f706",
"interface": "InfiniBand",
- "ip": "172.18.54.2",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f7:06",
"management": false,
@@ -33219,7 +33215,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f6f2",
"interface": "InfiniBand",
- "ip": "172.18.54.3",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f6:f2",
"management": false,
@@ -33429,7 +33424,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1fa66",
"interface": "InfiniBand",
- "ip": "172.18.54.4",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:fa:66",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index 951e4c87992f9da0ffde4a4983da69fbf2312657..dece5fe3e8fbd74916206c2e86f9882136467f18 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -341,7 +341,6 @@
"firmware_version": "16.26.4012",
"guid": "0x98039b03009266da",
"interface": "InfiniBand",
- "ip": "172.18.53.1",
"kavlan": false,
"mac": "98:03:9b:03:00:92:66:da",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index 47438f1c5607518114a020cea66f900e1daaaa8f..3fba594b78b9dd9cbe0329f1f0e57af9d887879b 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -341,7 +341,6 @@
"firmware_version": "16.26.4012",
"guid": "0x98039b03009a4a4e",
"interface": "InfiniBand",
- "ip": "172.18.53.2",
"kavlan": false,
"mac": "98:03:9b:03:00:9a:4a:4e",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
index 225fb1b2bd2f6c4c747fea21df0be74a0dce8669..5209c189274261c8192a958ef0000e73237f1e7d 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
@@ -203,7 +203,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f6f6",
"interface": "InfiniBand",
- "ip": "172.18.54.1",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f6:f6",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
index 5d3b2eae49a8ef1e3f887c53dc332624443fa882..991f68f55fd67965cfd264d4fd2f3c4c04d62aed 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
@@ -203,7 +203,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f706",
"interface": "InfiniBand",
- "ip": "172.18.54.2",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f7:06",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index 15aa6d33948d8df00a8ef2ffbc3798efd53b954b..8def16ba1c11fd95ec36f4c2e335880efa098dbe 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -203,7 +203,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1f6f2",
"interface": "InfiniBand",
- "ip": "172.18.54.3",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:f6:f2",
"management": false,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index 8ff95b40d271ed98209c8989371d60e065cceb31..a10b6f9ff40a7a999b5f3b198aedb16adcece99a 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -203,7 +203,6 @@
"firmware_version": "20.25.2006",
"guid": "0xb8599f0300d1fa66",
"interface": "InfiniBand",
- "ip": "172.18.54.4",
"kavlan": false,
"mac": "b8:59:9f:03:00:d1:fa:66",
"management": false,
diff --git a/data/grid5000/sites/lyon/pdus/pdu3b.json b/data/grid5000/sites/lyon/pdus/pdu3b.json
index 0751ad9e662eaccf98ed5e116143d8e1ae37d34f..d2850033e05752010d0f37739e34e21c3f104a08 100644
--- a/data/grid5000/sites/lyon/pdus/pdu3b.json
+++ b/data/grid5000/sites/lyon/pdus/pdu3b.json
@@ -17,7 +17,6 @@
"b8": "sirius-1",
"c1": "pyxis-1",
"c2": "pyxis-2",
- "c3": "switch-ib",
"c4": "gemini-2",
"c5": "gemini-1",
"c8": "sirius-1"
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 26a0fe790db0ff3f05355d5587d8dff1292f5ce3..ea7fffe87fbe69e798a49fd3a458de78e976c496 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -166,7 +166,6 @@ gemini-1:
firmware_version: 16.26.4012
guid: '0x98039b03009266da'
interface: InfiniBand
- ip: 172.18.53.1
mac: 98:03:9b:03:00:92:66:da
management: false
model: MT27800 Family [ConnectX-5]
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index c6391d54022884ee553e3a505b36e415bb43653e..5b40d4daae5dc28b020e37b5bc03963d01a748e6 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -166,7 +166,6 @@ gemini-2:
firmware_version: 16.26.4012
guid: '0x98039b03009a4a4e'
interface: InfiniBand
- ip: 172.18.53.2
mac: 98:03:9b:03:00:9a:4a:4e
management: false
model: MT27800 Family [ConnectX-5]
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
index aa1d781996c62308ff2969eaec144ce285c34f7a..694dfc9a993ff84a74303341fc480233ce1bb9a6 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -101,7 +101,6 @@ pyxis-1:
firmware_version: 20.25.2006
guid: '0xb8599f0300d1f6f6'
interface: InfiniBand
- ip: 172.18.54.1
mac: b8:59:9f:03:00:d1:f6:f6
management: false
model: MT28908 Family [ConnectX-6]
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
index 33c6b4a1258539d40868271bdc7d9cc7658ab1d7..efeca09a9c16da6e881da49cc91b04147c9e0a24 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -101,7 +101,6 @@ pyxis-2:
firmware_version: 20.25.2006
guid: '0xb8599f0300d1f706'
interface: InfiniBand
- ip: 172.18.54.2
mac: b8:59:9f:03:00:d1:f7:06
management: false
model: MT28908 Family [ConnectX-6]
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
index 405d22d1f042c62b27bb4fef8bb495b938a7f90d..2094a64619d28c67ee71e28cb85969f3670ad171 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -101,7 +101,6 @@ pyxis-3:
firmware_version: 20.25.2006
guid: '0xb8599f0300d1f6f2'
interface: InfiniBand
- ip: 172.18.54.3
mac: b8:59:9f:03:00:d1:f6:f2
management: false
model: MT28908 Family [ConnectX-6]
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
index 96039c722f6849213d9ef078574e7f159aca0886..15e4a622232ea897046f4ad1bf94b6ec3e85cb11 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -101,7 +101,6 @@ pyxis-4:
firmware_version: 20.25.2006
guid: '0xb8599f0300d1fa66'
interface: InfiniBand
- ip: 172.18.54.4
mac: b8:59:9f:03:00:d1:fa:66
management: false
model: MT28908 Family [ConnectX-6]
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index f0c7f1a43adb4655838d3a2c779e85418a48b060..6214e0d5bcefd1902f7b461fd229cdbeadc74590 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -285,7 +285,6 @@ pdus:
channel: 6
phase: 3
phase_inverted: false
- c3: switch-ib
c4:
uid: gemini-2
wattmetre: wattmetrev3-1