From 1c23a8c50ca59ef04101a74a65e599f450d36aab Mon Sep 17 00:00:00 2001
From: Guillaume Ranquet <guillaume.ranquet@inria.fr>
Date: Thu, 30 Sep 2010 12:20:21 +0200
Subject: [PATCH] [bordeaux] switch back borderline-[1-4] network cards, fixes
bug 2681
---
.../borderline/nodes/borderline-1.json | 18 +++---
.../borderline/nodes/borderline-2.json | 18 +++---
.../borderline/nodes/borderline-3.json | 12 ++--
.../borderline/nodes/borderline-4.json | 12 ++--
generators/input/bordeaux.rb | 59 +++++--------------
5 files changed, 44 insertions(+), 75 deletions(-)
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 e412700220..22aa2db0e9 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -40,31 +40,31 @@
"version": "NetXtreme II BCM5708"
},
{
- "device": "myri0",
+ "device": "ib0",
"driver": "ib_mthca",
"enabled": true,
- "interface": "Myrinet",
- "ip": "172.16.3.196",
+ "interface": "InfiniBand",
+ "ip": "172.16.4.196",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
+ "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
+ "vendor": "Mellanox",
+ "version": "InfiniHost MT25208"
},
{
- "device": "myri1",
+ "device": "myri0",
"driver": "ib_mthca",
"enabled": true,
"interface": "Myrinet",
- "ip": "172.16.3.199",
+ "ip": "172.16.3.196",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
+ "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
"rate": 10000000000,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
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 04b13d1617..fa37fcc577 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -40,31 +40,31 @@
"version": "NetXtreme II BCM5708"
},
{
- "device": "myri0",
+ "device": "ib0",
"driver": "ib_mthca",
"enabled": true,
- "interface": "Myrinet",
- "ip": "172.16.3.197",
+ "interface": "InfiniBand",
+ "ip": "172.16.4.197",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
+ "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
+ "vendor": "Mellanox",
+ "version": "InfiniHost MT25208"
},
{
- "device": "myri1",
+ "device": "myri0",
"driver": "ib_mthca",
"enabled": true,
"interface": "Myrinet",
- "ip": "172.16.3.198",
+ "ip": "172.16.3.197",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
+ "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
"rate": 10000000000,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
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 b3e01f66be..74e6007c2f 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -55,19 +55,19 @@
"version": "InfiniHost MT25208"
},
{
- "device": "ib1",
+ "device": "myri0",
"driver": "ib_mthca",
"enabled": true,
- "interface": "InfiniBand",
- "ip": "172.16.4.196",
+ "interface": "Myrinet",
+ "ip": "172.16.3.198",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
+ "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Mellanox",
- "version": "InfiniHost MT25208"
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
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 bdbb28dd05..16c936e9d1 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -55,19 +55,19 @@
"version": "InfiniHost MT25208"
},
{
- "device": "ib1",
+ "device": "myri0",
"driver": "ib_mthca",
"enabled": true,
- "interface": "InfiniBand",
- "ip": "172.16.4.197",
+ "interface": "Myrinet",
+ "ip": "172.16.3.199",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
- "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
+ "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Mellanox",
- "version": "InfiniHost MT25208"
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index 63233bd85d..9a2605f37d 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -167,8 +167,7 @@ site :bordeaux do |site_uid|
storage_devices [
{:interface => 'SAS', :size => 600.GB, :driver => nil}
]
- ifs = Array.new
- ifs += [
+ network_adapters [
{:interface => 'Ethernet', :rate => 1.G,
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => "Broadcom", :version => "NetXtreme II BCM5708",
@@ -178,48 +177,18 @@ site :bordeaux do |site_uid|
:network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
:vendor => "Broadcom", :version => "NetXtreme II BCM5708",
:enabled => true, :mounted => false, :mountable => true, :driver => "bnx2", :management => false, :device => "eth1",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")}
- ]
-#some cards have been swapped between hosts - refer to bug 2681 for explanations
- if i == 2 or i == 3
- ifs += [
- {:interface => 'InfiniBand', :rate => 10.G,
- :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
- :vendor => 'Mellanox', :version => "InfiniHost MT25208",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
- {:interface => 'InfiniBand', :rate => 10.G,
- :network_address => "#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr"),
- :vendor => 'Mellanox', :version => "InfiniHost MT25208",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib1",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")}]
- elsif i == 0 or i == 1
- ifs += [
- {:interface => 'Myrinet', :rate => 10.G,
- :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
- :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")},
- {:interface => 'Myrinet', :rate => 10.G,
- :network_address => "#{cluster_uid}-#{(i-2)-(i-3)*2}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{(i-2)-(i-3)*2}-myri0.#{site_uid}.grid5000.fr"),
- :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri1",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri1")}]
- else
- ifs += [
- {:interface => 'InfiniBand', :rate => 10.G,
- :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
- :vendor => 'Mellanox', :version => "InfiniHost MT25208",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
- {:interface => 'Myrinet', :rate => 10.G,
- :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
- :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
- :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
- :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")}]
- end
- network_adapters ifs
- end
- end
+ :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")},
+ {:interface => 'InfiniBand', :rate => 10.G,
+ :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+ :vendor => 'Mellanox', :version => "InfiniHost MT25208",
+ :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
+ :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
+ {:interface => 'Myrinet', :rate => 10.G,
+ :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+ :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
+ :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
+ :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")}]
+ end
+ end
end # cluster borderline
end
--
GitLab