Skip to content

GitLab

Commit 69b8c551 authored by PARISOT Clement's avatar PARISOT Clement
Browse files
Options

[nancy] grisou - Fix ib0 of grisou 50, 51

parent 70c498f7
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 65 deletions
data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
View file @ 69b8c551
......@@ -59,7 +59,7 @@
},
{
"bridged": false,
"device": "eth4",
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
......@@ -73,7 +73,7 @@
},
{
"bridged": false,
"device": "eth5",
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
......@@ -99,26 +99,26 @@
},
{
"bridged": false,
"device": "eth2",
"driver": "ib_ipoib",
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
"guid": null,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71",
"hwid": null,
"ib_switch_card": null,
"ib_switch_card_pos": null,
"interface": "Ethernet",
"interface": "InfiniBand",
"ip": "172.18.72.50",
"ip6": null,
"mac": "80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71",
"mac": null,
"management": false,
"model": "MT27500 Family [ConnectX-3]",
"mountable": true,
"mounted": true,
"network_address": "grisou-50-eth2.nancy.grid5000.fr",
"rate": 0,
"network_address": "grisou-50-ib0.nancy.grid5000.fr",
"rate": 56000000000,
"switch": "sgraoullyib",
"vendor": "Mellanox",
"version": null
"version": "MT4099"
}
],
"operating_system": {
......
data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
View file @ 69b8c551
......@@ -59,7 +59,7 @@
},
{
"bridged": false,
"device": "eth4",
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
......@@ -73,7 +73,7 @@
},
{
"bridged": false,
"device": "eth5",
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
......@@ -99,26 +99,26 @@
},
{
"bridged": false,
"device": "eth2",
"driver": "ib_ipoib",
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
"guid": null,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81",
"hwid": null,
"ib_switch_card": null,
"ib_switch_card_pos": null,
"interface": "Ethernet",
"interface": "InfiniBand",
"ip": "172.18.72.51",
"ip6": null,
"mac": "80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81",
"mac": null,
"management": false,
"model": "MT27500 Family [ConnectX-3]",
"mountable": true,
"mounted": true,
"network_address": "grisou-51-eth2.nancy.grid5000.fr",
"rate": 0,
"network_address": "grisou-51-ib0.nancy.grid5000.fr",
"rate": 56000000000,
"switch": "sgraoullyib",
"vendor": "Mellanox",
"version": null
"version": "MT4099"
}
],
"operating_system": {
......
generators/input/sites/nancy/clusters/grisou/grisou.rb
View file @ 69b8c551
......@@ -318,32 +318,32 @@ site :nancy do |site_uid|
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
:rate => 10.G,
:enabled => false,
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
:mountable => false,
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
:bridged => false,
:device => "eth4",
:device => "eth2",
:vendor => 'Intel Corporation',
:model => 'Ethernet 10G 2P X520 Adapter',
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
:rate => 10.G,
:enabled => false,
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
:mountable => false,
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
:bridged => false,
:device => "eth5",
:device => "eth3",
:vendor => 'Intel Corporation',
:model => 'Ethernet 10G 2P X520 Adapter',
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
},
{
:interface => 'Ethernet',
......@@ -358,27 +358,27 @@ site :nancy do |site_uid|
:device => "bmc"
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'rate'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
:enabled => true,
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => true,
:mounted => true,
:bridged => false,
:device => "eth2",
:device => "ib0",
:vendor => 'Mellanox',
:model => 'MT27500 Family [ConnectX-3]',
:version => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
:version => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mac'),
:ip => "172.18.72.#{i+1}",
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'ip6'),
:network_address => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
:guid => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'guid'),
:hwid => lookup('grisou_manual', node_uid, 'network_interfaces', 'eth2', 'hwid'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
:guid => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
:hwid => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'hwid'),
:switch => "sgraoullyib",
:ib_switch_card => lookup('grisou_manual', node_uid, 'network_interfaces', 'eth2', 'line_card'),
:ib_switch_card_pos => lookup('grisou_manual', node_uid, 'network_interfaces', 'eth2', 'position'),
:ib_switch_card => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
:ib_switch_card_pos => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
},]
end
......
generators/input/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
View file @ 69b8c551
......@@ -18,8 +18,8 @@ grisou-50:
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1264
timewrite: 2885
timeread: 1278
timewrite: 2879
sdb:
device: sdb
size: 600127266816
......@@ -30,6 +30,18 @@ grisou-50:
main_memory:
ram_size: 135291469824
network_interfaces:
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:0b:a4
mounted: false
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:0b:a5
mounted: false
management: false
eth0:
interface: Ethernet
ip: 172.16.72.50
......@@ -44,24 +56,26 @@ grisou-50:
mac: 24:6e:96:03:0b:a2
mounted: false
management: false
eth4:
eth2:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7e:4c:24
mounted: false
management: false
eth5:
eth3:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7e:4c:26
mounted: false
management: false
eth2:
interface: Ethernet
driver: ib_ipoib
mac: 80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71
rate: 0
mounted: false
ib0:
interface: InfiniBand
ip: 172.18.72.50
driver: mlx4_core
guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71
rate: 56000000000
version: MT4099
mounted: true
management: false
operating_system:
name: debian
......
generators/input/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
View file @ 69b8c551
......@@ -18,8 +18,8 @@ grisou-51:
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1276
timewrite: 2913
timeread: 1281
timewrite: 2952
sdb:
device: sdb
size: 600127266816
......@@ -30,6 +30,12 @@ grisou-51:
main_memory:
ram_size: 135291469824
network_interfaces:
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:24:24
mounted: false
management: false
eth0:
interface: Ethernet
ip: 172.16.72.51
......@@ -38,30 +44,38 @@ grisou-51:
rate: 10000000000
mounted: true
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:24:25
mounted: false
management: false
eth1:
interface: Ethernet
driver: ixgbe
mac: 24:6e:96:03:24:22
mounted: false
management: false
eth4:
eth2:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7e:4c:e8
mounted: false
management: false
eth5:
eth3:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7e:4c:ea
mounted: false
management: false
eth2:
interface: Ethernet
driver: ib_ipoib
mac: 80:00:00:48:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81
rate: 0
mounted: false
ib0:
interface: InfiniBand
ip: 172.18.72.51
driver: mlx4_core
guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81
rate: 56000000000
version: MT4099
mounted: true
management: false
operating_system:
name: debian
......
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