Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 45798749 authored by Guillaume Ranquet's avatar Guillaume Ranquet
Browse files

[Bordeaux] changes made on borderline on bug 2681 : some cards have been swapped

parent 128dd280
......@@ -11,13 +11,10 @@
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.196",
"network_address": "borderline-1.bordeaux.grid5000.fr",
"interface": "InfiniBand SDR",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"enabled": true,
......@@ -25,18 +22,6 @@
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.205",
"network_address": "borderline-10.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.205",
"network_address": "borderline-10.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -11,13 +11,10 @@
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.197",
"network_address": "borderline-2.bordeaux.grid5000.fr",
"interface": "InfiniBand SDR",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"enabled": true,
......@@ -25,18 +22,6 @@
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
}
],
"operating_system": {
......
......@@ -21,22 +21,13 @@
},
{
"enabled": true,
"interface": "InfiniBand SDR",
"interface": "Myrinet 10G",
"ip": "172.16.1.198",
"network_address": "borderline-2.bordeaux.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -21,22 +21,13 @@
},
{
"enabled": true,
"interface": "InfiniBand SDR",
"interface": "Myrinet 10G",
"ip": "172.16.1.199",
"network_address": "borderline-1.bordeaux.grid5000.fr",
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.200",
"network_address": "borderline-5.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.200",
"network_address": "borderline-5.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.201",
"network_address": "borderline-6.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.201",
"network_address": "borderline-6.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.202",
"network_address": "borderline-7.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.202",
"network_address": "borderline-7.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.203",
"network_address": "borderline-8.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.203",
"network_address": "borderline-8.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
{
"enabled": true,
"interface": "Myrinet 10G",
"ip": "172.16.1.204",
"network_address": "borderline-9.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
{
"enabled": true,
"interface": "InfiniBand SDR",
......@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
"driver": "e1000",
"enabled": true,
"interface": "Ethernet",
"rate": 1000000000
},
{
"driver": "e1000",
"enabled": false,
"interface": "Ethernet",
"rate": 1000000000
"interface": "Myrinet 10G",
"ip": "172.16.1.204",
"network_address": "borderline-9.bordeaux.grid5000.fr",
"rate": 10000000000,
"switch": null,
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
}
],
"operating_system": {
......
......@@ -197,13 +197,29 @@ version 1.48"
{:interface => 'SAS', :size => 600.GB, :driver => nil}
]
network_adapters [
{:interface => 'Myrinet 10G', :rate => 10.G,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
]
#some cards have been swapped between hosts - refer to bug 2681 for explanations
if i == 0 or i == 1
network_adapters [
{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true}]
elsif i == 2 or i == 3
network_adapters [
{:interface => 'Myrinet 10G', :rate => 10.G,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'Myrinet 10G', :rate => 10.G,
:switch => nil, :network_address => "#{cluster_uid}-#{(i-2)-(i-3)*2}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
else
network_adapters [
{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
{:interface => 'Myrinet 10G', :rate => 10.G,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
end
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