From 4bc52ab2137bd92369bfd07d24082fdf549f2e3e Mon Sep 17 00:00:00 2001 From: Clement Parisot Date: Tue, 15 Mar 2016 17:48:00 +0100 Subject: [PATCH] [nancy] graoully - Remove null switch/port on non connected interfaces --- .../nancy/clusters/graoully/nodes/graoully-1.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-10.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-11.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-12.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-13.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-14.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-15.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-16.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-2.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-3.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-4.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-5.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-6.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-7.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-8.json | 10 ---------- .../nancy/clusters/graoully/nodes/graoully-9.json | 10 ---------- .../input/sites/nancy/clusters/graoully/graoully.rb | 10 ---------- 17 files changed, 170 deletions(-) diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json index ab1ffe54a4..f0e49c9354 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json index 24e86392e6..d1a93e6d35 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json index b356ff4369..f200205018 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json index bc5bc8e958..44d47978de 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json index 1491a9a55b..92bc874329 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json index 15607b9520..4fe243a76e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json index f6269b44e9..65caafc427 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json index f1edb16709..060997a6c8 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json index f97075875f..e3306bed9d 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json index c46a6486da..e176f7524e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json index 46da77368c..2a01894332 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json index 6d0507a05e..6d8173c8a7 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json index 15bda14e22..28d95346a3 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json index 2d665e4d29..da98820f64 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json index e40e0cbce2..d29f8e4d19 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json index bd015887d6..3a04e63090 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/generators/input/sites/nancy/clusters/graoully/graoully.rb b/generators/input/sites/nancy/clusters/graoully/graoully.rb index 35f25f7ae4..4aa3d39c4b 100644 --- a/generators/input/sites/nancy/clusters/graoully/graoully.rb +++ b/generators/input/sites/nancy/clusters/graoully/graoully.rb @@ -105,8 +105,6 @@ site :nancy do |site_uid| :model => '82599ES 10-Gigabit SFI/SFP+ Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth1'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth1'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'), @@ -121,8 +119,6 @@ site :nancy do |site_uid| :model => 'Ethernet 10G 2P X520 Adapter', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth2'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth2'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'), @@ -137,8 +133,6 @@ site :nancy do |site_uid| :model => 'Ethernet 10G 2P X520 Adapter', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth3'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth3'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'), @@ -153,8 +147,6 @@ site :nancy do |site_uid| :model => 'I350 Gigabit Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth4'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth4'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'), @@ -169,8 +161,6 @@ site :nancy do |site_uid| :model => 'I350 Gigabit Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth5'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth5'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'), -- GitLab