From 85f0fb8365f8bbd34b2c3b291916154996a59952 Mon Sep 17 00:00:00 2001 From: Sebastien Philippot <sebastien.philippot@inria.fr> Date: Fri, 29 Sep 2017 13:23:33 +0200 Subject: [PATCH] [nancy] remove griffon-[11-14] myri10ge in griffon_pdu.yaml. griffon-[12-13] are retired. griffon-[11,14] interface eth2 is not connected to any switch. --- .../clusters/griffon/nodes/griffon-11.json | 7 ------ .../clusters/griffon/nodes/griffon-14.json | 7 ------ .../check-cluster-homogeneity.yaml.erb | 2 -- grid5000-all.json | 24 ------------------- .../nancy/clusters/griffon/griffon_pdu.yaml | 20 ---------------- 5 files changed, 60 deletions(-) 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 2650db05f27..be5f18a59a7 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 db5eb49b433..325caa46cd1 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 e622ffdf0a4..b4a52fe8c23 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 c5686078769..cad27ef3099 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 ea7a479ef3a..829a143a7de 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 -- GitLab