Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 7e59c3da authored by Guillaume Ranquet's avatar Guillaume Ranquet Committed by g5kadmin user

[bordeaux][borderline] correcting missing eth0/eth1 interfaces

parent ae3942ca
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.196",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.196",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-1-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "myri0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.205",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-10.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.205",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-10-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.197",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-2.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.197",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-2-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "myri0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.198",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-3.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.198",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-3-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.199",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-4.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.199",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-4-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.200",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-5.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.200",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-5-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.201",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-6.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.201",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-6-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.202",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-7.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.202",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-7-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.203",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-8.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.203",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-8-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -9,6 +9,36 @@
"virtual_size": null
},
"network_adapters": [
{
"device": "eth0",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.1.204",
"mac": "",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "borderline-9.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "eth1",
"driver": "bnx2",
"enabled": true,
"interface": "Ethernet",
"ip": "192.168.133.204",
"mac": "",
"management": false,
"mountable": true,
"mounted": false,
"network_address": "borderline-9-eth1.bordeaux.grid5000.fr",
"rate": 1000000000,
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
{
"device": "ib0",
"driver": "ib_mthca",
......
......@@ -167,7 +167,8 @@ site :bordeaux do |site_uid|
storage_devices [
{:interface => 'SAS', :size => 600.GB, :driver => nil}
]
network_adapters [
ifs = Array.new
ifs += [
{: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",
......@@ -181,7 +182,7 @@ site :bordeaux do |site_uid|
]
#some cards have been swapped between hosts - refer to bug 2681 for explanations
if i == 2 or i == 3
network_adapters [
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",
......@@ -193,7 +194,7 @@ site :bordeaux do |site_uid|
: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
network_adapters [
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",
......@@ -205,7 +206,7 @@ site :bordeaux do |site_uid|
:enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri1",
:mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri1")}]
else
network_adapters [
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",
......@@ -217,6 +218,7 @@ site :bordeaux do |site_uid|
: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
......
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