diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json index 2650db05f27ac4a553285f479b65b6adca1a4075..be5f18a59a77b1164ad62ce57a9f447e8f06ecf6 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json @@ -89,13 +89,6 @@ "vendor": "Intel", "version": "BCM5721" }, - { - "device": "eth2", - "driver": "myri10ge", - "interface": "Ethernet", - "kavlan": false, - "mac": "00:60:dd:46:84:b7" - }, { "device": "ib0", "driver": "mlx4_core", diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json index db5eb49b4336a65615f0ecae57aab974023c6aff..325caa46cd17a1f3cf374c3cc01b13376c5f038a 100644 --- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json +++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json @@ -89,13 +89,6 @@ "vendor": "Intel", "version": "BCM5721" }, - { - "device": "eth2", - "driver": "myri10ge", - "interface": "Ethernet", - "kavlan": false, - "mac": "00:60:dd:46:84:b8" - }, { "device": "ib0", "driver": "mlx4_core", diff --git a/generators/input-validators/check-cluster-homogeneity.yaml.erb b/generators/input-validators/check-cluster-homogeneity.yaml.erb index e622ffdf0a4a559687255f8ad7c60e9ad386d16e..b4a52fe8c2357b6d2057569f16d448f222ec0a37 100644 --- a/generators/input-validators/check-cluster-homogeneity.yaml.erb +++ b/generators/input-validators/check-cluster-homogeneity.yaml.erb @@ -52,8 +52,6 @@ nancy: griffon-[1-91]: - +chassis.serial - -chassis.serial - griffon-11: - - +network_adapters.eth2 griffon-15: - -network_adapters.eth2 diff --git a/grid5000-all.json b/grid5000-all.json index c568607876906ace6c631a3baa50920846590c05..cad27ef3099c2fe416fef1e9d15816826f4e610c 100644 --- a/grid5000-all.json +++ b/grid5000-all.json @@ -109377,13 +109377,6 @@ "vendor": "Intel", "version": "BCM5721" }, - { - "device": "eth2", - "driver": "myri10ge", - "interface": "Ethernet", - "kavlan": false, - "mac": "00:60:dd:46:84:b7" - }, { "device": "ib0", "driver": "mlx4_core", @@ -109589,11 +109582,6 @@ "vendor": "intel", "version": "BCM5721" }, - "eth2": { - "driver": "myri10ge", - "interface": "Ethernet", - "mac": "00:60:dd:46:84:b9" - }, "ib0": { "driver": "mlx4_core", "enabled": false, @@ -109774,11 +109762,6 @@ "vendor": "intel", "version": "BCM5721" }, - "eth2": { - "driver": "myri10ge", - "interface": "Ethernet", - "mac": "00:60:dd:46:84:a8" - }, "ib0": { "driver": "mlx4_core", "enabled": false, @@ -109959,13 +109942,6 @@ "vendor": "Intel", "version": "BCM5721" }, - { - "device": "eth2", - "driver": "myri10ge", - "interface": "Ethernet", - "kavlan": false, - "mac": "00:60:dd:46:84:b8" - }, { "device": "ib0", "driver": "mlx4_core", diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon_pdu.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon_pdu.yaml index ea7a479ef3a94a5418d1061851b5f06dc10ffaf1..829a143a7debb0d484ebbff1b660fc56e3182c04 100644 --- a/input/grid5000/sites/nancy/clusters/griffon/griffon_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/griffon/griffon_pdu.yaml @@ -46,38 +46,18 @@ nodes: - uid: griffon-pdu1 port: 11 griffon-11: - network_adapters: - eth2: - interface: Ethernet - driver: myri10ge - mac: 00:60:dd:46:84:b7 pdu: - uid: griffon-pdu1 port: 12 griffon-12: - network_adapters: - eth2: - interface: Ethernet - driver: myri10ge - mac: 00:60:dd:46:84:b9 pdu: - uid: griffon-pdu1 port: 13 griffon-13: - network_adapters: - eth2: - interface: Ethernet - driver: myri10ge - mac: 00:60:dd:46:84:a8 pdu: - uid: griffon-pdu1 port: 14 griffon-14: - network_adapters: - eth2: - interface: Ethernet - driver: myri10ge - mac: 00:60:dd:46:84:b8 pdu: - uid: griffon-pdu1 port: 15