Commit 1c23a8c5 authored by Guillaume Ranquet's avatar Guillaume Ranquet Committed by g5kadmin user
Browse files

[bordeaux] switch back borderline-[1-4] network cards, fixes bug 2681

parent ee09542b
...@@ -40,31 +40,31 @@ ...@@ -40,31 +40,31 @@
"version": "NetXtreme II BCM5708" "version": "NetXtreme II BCM5708"
}, },
{ {
"device": "myri0", "device": "ib0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "Myrinet", "interface": "InfiniBand",
"ip": "172.16.3.196", "ip": "172.16.4.196",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-1-myri0.bordeaux.grid5000.fr", "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Myrinet", "vendor": "Mellanox",
"version": "10G-PCIE-8A-C" "version": "InfiniHost MT25208"
}, },
{ {
"device": "myri1", "device": "myri0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "Myrinet", "interface": "Myrinet",
"ip": "172.16.3.199", "ip": "172.16.3.196",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-4-myri0.bordeaux.grid5000.fr", "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Myrinet", "vendor": "Myrinet",
"version": "10G-PCIE-8A-C" "version": "10G-PCIE-8A-C"
......
...@@ -40,31 +40,31 @@ ...@@ -40,31 +40,31 @@
"version": "NetXtreme II BCM5708" "version": "NetXtreme II BCM5708"
}, },
{ {
"device": "myri0", "device": "ib0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "Myrinet", "interface": "InfiniBand",
"ip": "172.16.3.197", "ip": "172.16.4.197",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-2-myri0.bordeaux.grid5000.fr", "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Myrinet", "vendor": "Mellanox",
"version": "10G-PCIE-8A-C" "version": "InfiniHost MT25208"
}, },
{ {
"device": "myri1", "device": "myri0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "Myrinet", "interface": "Myrinet",
"ip": "172.16.3.198", "ip": "172.16.3.197",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-3-myri0.bordeaux.grid5000.fr", "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Myrinet", "vendor": "Myrinet",
"version": "10G-PCIE-8A-C" "version": "10G-PCIE-8A-C"
......
...@@ -55,19 +55,19 @@ ...@@ -55,19 +55,19 @@
"version": "InfiniHost MT25208" "version": "InfiniHost MT25208"
}, },
{ {
"device": "ib1", "device": "myri0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "InfiniBand", "interface": "Myrinet",
"ip": "172.16.4.196", "ip": "172.16.3.198",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-1-ib0.bordeaux.grid5000.fr", "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Mellanox", "vendor": "Myrinet",
"version": "InfiniHost MT25208" "version": "10G-PCIE-8A-C"
} }
], ],
"operating_system": { "operating_system": {
......
...@@ -55,19 +55,19 @@ ...@@ -55,19 +55,19 @@
"version": "InfiniHost MT25208" "version": "InfiniHost MT25208"
}, },
{ {
"device": "ib1", "device": "myri0",
"driver": "ib_mthca", "driver": "ib_mthca",
"enabled": true, "enabled": true,
"interface": "InfiniBand", "interface": "Myrinet",
"ip": "172.16.4.197", "ip": "172.16.3.199",
"mac": "", "mac": "",
"management": false, "management": false,
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "borderline-2-ib0.bordeaux.grid5000.fr", "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
"rate": 10000000000, "rate": 10000000000,
"vendor": "Mellanox", "vendor": "Myrinet",
"version": "InfiniHost MT25208" "version": "10G-PCIE-8A-C"
} }
], ],
"operating_system": { "operating_system": {
......
...@@ -167,8 +167,7 @@ site :bordeaux do |site_uid| ...@@ -167,8 +167,7 @@ site :bordeaux do |site_uid|
storage_devices [ storage_devices [
{:interface => 'SAS', :size => 600.GB, :driver => nil} {:interface => 'SAS', :size => 600.GB, :driver => nil}
] ]
ifs = Array.new network_adapters [
ifs += [
{:interface => 'Ethernet', :rate => 1.G, {:interface => 'Ethernet', :rate => 1.G,
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => "Broadcom", :version => "NetXtreme II BCM5708", :vendor => "Broadcom", :version => "NetXtreme II BCM5708",
...@@ -178,48 +177,18 @@ site :bordeaux do |site_uid| ...@@ -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"), :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", :vendor => "Broadcom", :version => "NetXtreme II BCM5708",
:enabled => true, :mounted => false, :mountable => true, :driver => "bnx2", :management => false, :device => "eth1", :enabled => true, :mounted => false, :mountable => true, :driver => "bnx2", :management => false, :device => "eth1",
:mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")} :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")},
] {:interface => 'InfiniBand', :rate => 10.G,
#some cards have been swapped between hosts - refer to bug 2681 for explanations :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
if i == 2 or i == 3 :vendor => 'Mellanox', :version => "InfiniHost MT25208",
ifs += [ :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
{:interface => 'InfiniBand', :rate => 10.G, :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"), {:interface => 'Myrinet', :rate => 10.G,
:vendor => 'Mellanox', :version => "InfiniHost MT25208", :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
:enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0", :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
:mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")}, :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
{:interface => 'InfiniBand', :rate => 10.G, :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")}]
:network_address => "#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr"), end
:vendor => 'Mellanox', :version => "InfiniHost MT25208", end
: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
end # cluster borderline end # cluster borderline
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment