Commit 4b759671 authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

[orsay] updating network architecture.

parent a54a1053
......@@ -10,7 +10,7 @@ begin
Bundler.setup
rescue LoadError => e
STDERR.puts e.message
STDERR.puts "Try installing bundler: `gem install bundler`"
STDERR.puts "Try installing bundler: `sudo gem install bundler`"
exit!
rescue Bundler::GemNotFound => e
STDERR.puts e.message
......
This diff is collapsed.
site :orsay do |site_uid|
# ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
cluster :gdx do |cluster_uid|
model "IBM eServer 326m"
created_at nil
misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
# switches = Hash[["eth0","bmc","rsa","mx"].map{|iface| [iface,{"name"=>"switch"}]}]
# switches = Hash[["eth0","bmc","rsa","mx"].map{|iface| [iface,{}]}]
switches = {}
@clusters["gdx"].each.each_with_index {|ifaces, id|
ifaces.each{|iface,sw_name| update_switch switches, iface, sw_name }
fail "switches = #{switches.inspect}"
# switch_eth0 = lookup('orsay-network',ifaces["eth0"]) unless switch_eth0["name"] == ifaces["eth0"]
}
return
# WARN: 2 nodes are missing (gdx-311 and gdx-312) and won't appear in the reference
1.upto(180+132-2) do |i|
switch_eth0 = get_switch_for_node lookup("orsay-links","links-eth0","gdx"), i unless switch_match_node switch_eth0, i
switch_bmc = get_switch_for_node lookup("orsay-links","links-bmc","gdx"), i unless switch_match_node switch_bmc, i
switch_rsa = get_switch_for_node lookup("orsay-links","links-rsa","gdx"), i unless switch_match_node switch_rsa, i
switch_mx = get_switch_for_node lookup("orsay-links","links-mx","gdx"), i unless switch_match_node switch_mx, i
node "#{cluster_uid}-#{i}" do |node_uid|
cmts = lookup('orsay-gdx', "#{node_uid}", 'comments')
comments cmts unless cmts.nil?
supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
architecture({
:smp_size => 2,
:smt_size => 2,
:platform_type => "x86_64"
})
processor({
:vendor => "AMD",
:model => "AMD Opteron",
:version => "246",
:clock_speed => 2.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 2.GiB, # bytes
:virtual_size => nil
})
operating_system({
:name => "debian-x64-5-prod",
:release => "5.1.2",
:version => "5",
:kernel => "2.6.26"
})
storage_devices [
{:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
]
network_adapters [{
:interface => 'Ethernet',
:device => 'bmc',
:rate => (eval switch_bmc["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_bmc'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
:enabled => true,
:management => true,
:mountable => false,
:mounted => false,
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
:switch => (switch_bmc["name"]+".#{site_uid}.grid5000.fr"),
:switch_ip => switch_bmc["ip"],
:switch_mac => switch_bmc["mac"],
:switch_console => (switch_rsa["name"]+".#{site_uid}.grid5000.fr"),
:switch_console_ip => switch_rsa["ip"],
:switch_console_mac => switch_rsa["mac"]
},{
:interface => 'Myrinet',
:device => 'myri0',
:rate => (eval switch_mx["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_myri0'),
:vendor => 'Myrinet',
:version => '10G-PCIE-8A-C',
:enabled => true,
:management => false,
:mountable => true,
:driver => "mx_driver",
:mounted => true,
:network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
:switch => (switch_mx["name"]+".#{site_uid}.grid5000.fr"),
:switch_ip => switch_mx["ip"],
:switch_mac => switch_mx["mac"]
},{
:interface => 'Ethernet',
:device => 'eth0',
:rate => (eval switch_eth0["rate"]),
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_eth0'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
:enabled => true,
:management => false,
:mountable => true,
:driver => 'tg3',
:mounted => true,
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}.#{site_uid}.grid5000.fr"),
:switch => (switch_eth0["name"]+".#{site_uid}.grid5000.fr"),
:switch_ip => switch_eth0["ip"],
:switch_mac => switch_eth0["mac"]
},{
:interface => 'Ethernet',
:device => 'eth1',
:rate => 0,
:mac => lookup('orsay-gdx', "#{node_uid}", 'mac_eth1'),
:vendor => 'Broadcom',
:version => 'NetXtreme BCM5780',
:enabled => false,
:management => false,
:mountable => false,
:driver => 'tg3',
:mounted => false,
:network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
:ip => dns_lookup_through_ssh(ssh,"#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
:switch => nil,
:switch_ip => nil,
:switch_mac => nil
}]
end
end
# extension specifics, starting at node 181
(181).upto(306) do |i|
node "#{cluster_uid}-#{i}" do
processor({
:version => "250",
:clock_speed => 2.4.G
})
end
end
end # cluster gdx
ssh.close
end
This diff is collapsed.
---
nodes-eth0-switch:
gdx:
switch11: "1,18"
switch12: "19,36"
switch09: "37,54"
switch08: "55,72"
switch06: "73,90"
switch05: "91,108"
switch02: "109,126"
switch03: "127,144"
switch07: "145,162"
switch13: "163,180"
switch15: "181,198"
switch14: "199,216"
switch16: "217,234"
switch10: "235,252"
procurve17: "253,270"
procurve18: "271,288"
procurve-04-07: "289,310"
netgdx:
gw: "1,30"
nodes-eth1-switch:
netgdx:
gw: "1,30"
nodes-eth2-switch:
netgdx:
gw: "1,30"
nodes-bmc-switch:
gdx:
netgear01: "1,36"
netgear02: "37,72"
netgear03: "73,108"
netgear04: "109,144"
netgear05: "145,180"
netgear06: "181,216"
netgear07: "217,252"
procurve-bmc-06: "253,271"
procurve-bmc-09: "272,288"
procurve-04-07: "289,310"
netgdx:
gw: "1,30"
nodes-rsa-switch:
gdx:
mrv01: "1,36"
mrv02: "37,72"
mrv03: "73,108"
mrv04: "109,144"
mrv05: "145,180"
mrv06: "181,216"
mrv07: "217,252"
mrv08: "253,288"
mrv09: "289,310"
netgdx:
mrv00: "1,30"
nodes-mx-switch:
gdx:
switch-mx: "1,310"
switch-to-switch:
switch-nil:
nodes: "gdx-1,310-eth1"
myri:
nodes : "gdx-1,310-myri0"
gw:
nodes :
- "netgdx-1,3-eth0"
- "netgdx-1,3-eth1"
- "netgdx-1,3-eth2"
- "netgdx-1,30-eth0"
- "netgdx-1,30-eth1"
- "netgdx-1,30-eth2"
next :
- switch11:
width: 2
nodes: "gdx-1,18-eth0"
next:
- netgear01:
width: 1
nodes: "gdx-1,36-bmc"
- switch12:
width: 2
nodes: "gdx-19,36-eth0"
next:
- mrv01:
width: 1
nodes: "gdx-1,36-rsa"
- switch09:
width: 2
nodes: "gdx-37,54-eth0"
next:
- netgear02:
width: 1
nodes: "gdx-37,72-bmc"
- switch08:
width: 2
nodes: "gdx-55,72-eth0"
next:
- mrv02:
width: 1
nodes: "gdx-37,72-rsa"
- switch06:
width: 2
nodes: "gdx-73,90-eth0"
next:
- netgear03:
width: 1
nodes: "gdx-73,108-bmc"
- switch05:
width: 2
nodes: "gdx-91,108-eth0"
next:
- mrv03:
width: 1
nodes: "gdx-73,108-rsa"
- switch03:
width: 2
nodes: "gdx-109,126-eth0"
next:
- netgear04:
width: 1
nodes: "gdx-109,144-bmc"
- switch02:
width: 2
nodes: "gdx-127,144-eth0"
next:
- mrv04:
width: 1
nodes: "gdx-109,144-rsa"
- switch18:
width: 2
nodes: "gdx-145,162-eth0"
next:
- netgear05:
width: 1
nodes: "gdx-145,180-bmc"
- switch17:
width: 2
nodes: "gdx-163,180-eth0"
next:
- mrv05:
width: 1
nodes: "gdx-145,180-rsa"
- switch15:
width: 2
nodes: "gdx-181,198-eth0"
next:
- netgear06:
width: 1
nodes: "gdx-181,216-bmc"
- switch14:
width: 2
nodes: "gdx-199,216-eth0"
next:
- mrv06:
width: 1
nodes: "gdx-181,216-rsa"
- switch07:
width: 2
nodes: "gdx-217,234-eth0"
next:
- netgear07:
width: 1
nodes: "gdx-217,252-bmc"
- switch04:
width: 2
nodes: "gdx-235,252-eth0"
next:
- mrv07:
width: 1
nodes: "gdx-217,252-rsa"
- switch10:
width: 2
nodes: "gdx-253,270-eth0"
next:
- netgear08:
width: 1
nodes: "gdx-253,288-bmc"
- switch11:
width: 2
nodes: "gdx-271,288-eth0"
next:
- mrv08:
width: 1
nodes: "gdx-253,288-rsa"
- switch01:
width: 2
nodes: "gdx-298,306-eth0"
next:
- netgear09:
width: 1
nodes: "gdx-298,310-bmc"
- switch13:
width: 2
nodes: "gdx-307,310-eth0"
next:
- mrv09:
width: 1
nodes: "gdx-298,310-rsa"
switch-mx:
nodes : "gdx-1,4-myri0"
- netgear10:
width: 1
nodes: "netgdx-1,30-bmc"
- mrv00:
width: 1
nodes: "netgdx-1,30-rsa"
- switch01:
width: 2
nodes: "gdx-1,18-eth0"
next:
- netgear01:
width: 1
nodes: "gdx-1,36-bmc"
- switch02:
width: 2
nodes: "gdx-19,36-eth0"
next:
- mrv01:
width: 1
nodes: "gdx-1,36-rsa"
- switch03:
width: 2
nodes: "gdx-37,54-eth0"
next:
- netgear02:
width: 1
nodes: "gdx-37,72-bmc"
- switch04:
width: 2
nodes: "gdx-55,72-eth0"
next:
- mrv02:
width: 1
nodes: "gdx-37,72-rsa"
- switch05:
width: 2
nodes: "gdx-73,90-eth0"
next:
- netgear03:
width: 1
nodes: "gdx-73,108-bmc"
- switch06:
width: 2
nodes: "gdx-91,108-eth0"
next:
- mrv03:
width: 1
nodes: "gdx-73,108-rsa"
- switch07:
width: 2
nodes: "gdx-109,126-eth0"
next:
- netgear04:
width: 1
nodes: "gdx-109,144-bmc"
- switch08:
width: 2
nodes: "gdx-127,144-eth0"
next:
- mrv04:
width: 1
nodes: "gdx-109,144-rsa"
- switch09:
width: 2
nodes: "gdx-145,162-eth0"
next:
- netgear05:
width: 1
nodes: "gdx-145,180-bmc"
- switch10:
width: 2
nodes: "gdx-163,180-eth0"
next:
- mrv05:
width: 1
nodes: "gdx-145,180-rsa"
- switch11:
width: 2
nodes: "gdx-181,198-eth0"
next:
- netgear08:
width: 1
nodes: "gdx-181,216-bmc"
- switch12:
width: 2
nodes: "gdx-199,216-eth0"
next:
- mrv06:
width: 1
nodes: "gdx-181,216-rsa"
- switch13:
width: 2
nodes: "gdx-217,234-eth0"
next:
- netgear07:
width: 1
nodes: "gdx-217,252-bmc"
- switch14:
width: 2
nodes: "gdx-235,252-eth0"
next:
- mrv07:
width: 1
nodes: "gdx-217,252-rsa"
- procurve15:
width: 2
nodes: "gdx-253,270-eth0"
next:
- procurve06:
width: 1
nodes: "gdx-253,270-bmc"
- procurve16:
width: 2
nodes: "gdx-271,288-eth0"
next:
- procurve09:
width: 1
nodes: "gdx-271,288-bmc"
- mrv08:
width: 1
nodes: "gdx-253,288-rsa"
- procurve17:
width: 2
nodes:
- "gdx-298,310-eth0"
- "gdx-298,310-bmc"
next:
- mrv09:
width: 1
nodes: "gdx-298,310-rsa"
\ No newline at end of file
---
netgdx-10:
mac_eth0: 00:11:25:c4:28:42
mac_eth1: 00:11:25:c4:28:43
mac_eth2: 00:10:18:16:4d:f9
mac_bmc: 00:11:25:91:48:4C
netgdx-11:
mac_eth0: 00:11:25:c4:4f:56
mac_eth1: 00:11:25:c4:4f:57
mac_eth2: 00:10:18:16:4d:dc
mac_bmc: 00:11:25:91:45:A4
netgdx-12:
mac_eth0: 00:11:25:c4:4d:ea
mac_eth1: 00:11:25:c4:4d:eb
mac_eth2: 00:10:18:16:4d:57
mac_bmc: 00:11:25:91:45:C0
netgdx-13:
mac_eth0: 00:11:25:c4:52:b6
mac_eth1: 00:11:25:c4:52:b7
mac_eth2: 00:10:18:16:4d:cb
mac_bmc: 00:11:25:91:45:86
netgdx-14:
mac_eth0: 00:11:25:c4:52:62
mac_eth1: 00:11:25:c4:52:63
mac_eth2: 00:10:18:16:4f:d9
mac_bmc: 00:11:25:91:48:E0
netgdx-15:
mac_eth0: 00:11:25:c4:4f:76
mac_eth1: 00:11:25:c4:4f:77
mac_eth2: 00:10:18:16:4f:0b
mac_bmc: 00:11:25:91:49:51
netgdx-16:
mac_eth0: 00:11:25:c4:4f:48
mac_eth1: 00:11:25:c4:4f:49
mac_eth2: 00:10:18:16:4f:0e
mac_bmc: 00:11:25:91:48:F6
netgdx-17:
mac_eth0: 00:11:25:c4:42:e0
mac_eth1: 00:11:25:c4:42:e1
mac_eth2: 00:10:18:16:4f:23
mac_bmc: 00:11:25:91:48:3E
netgdx-18:
mac_eth0: 00:11:25:c4:4e:c6
mac_eth1: 00:11:25:c4:4e:c7
mac_eth2: 00:10:18:16:28:1c
mac_bmc: 00:11:25:91:47:B7
netgdx-19:
mac_eth0: 00:11:25:c4:4f:8a
mac_eth1: 00:11:25:c4:4f:8b
mac_eth2: 00:10:18:16:4f:74
mac_bmc: 00:11:25:91:46:65
netgdx-1:
mac_eth0: 00:11:25:c4:4f:62
mac_eth1: 00:11:25:c4:4f:63
mac_eth2: 00:10:18:16:4f:2e
mac_bmc: 00:11:25:91:48:1E
netgdx-20:
mac_eth0: 00:11:25:c4:4d:7c
mac_eth1: 00:11:25:c4:4d:7d
mac_eth2: 00:10:18:16:4e:ec
mac_bmc: 00:11:25:91:47:7E
netgdx-21:
mac_eth0: 00:11:25:c4:50:2e
mac_eth1: 00:11:25:c4:50:2f
mac_eth2: 00:10:18:0b:e2:c2
mac_bmc: 00:11:25:91:47:A5
netgdx-22:
mac_eth0: 00:11:25:c4:4f:7e
mac_eth1: 00:11:25:c4:4f:7f
mac_eth2: 00:10:18:0b:d8:a3
mac_bmc: 00:11:25:91:46:5F
netgdx-23:
mac_eth0: 00:11:25:c4:4f:fe
mac_eth1: 00:11:25:c4:4f:ff
mac_eth2: 00:10:18:00:fa:12
mac_bmc: 00:11:25:91:46:68
netgdx-24:
mac_eth0: 00:11:25:c4:54:8a
mac_eth1: 00:11:25:c4:54:8b
mac_eth2: 00:10:18:06:4f:a5
mac_bmc: 00:11:25:91:46:A2
netgdx-25:
mac_eth0: 00:11:25:c4:52:68
mac_eth1: 00:11:25:c4:52:69
mac_eth2: 00:10:18:06:4f:e8
mac_bmc: 00:11:25:91:46:4B
netgdx-26:
mac_eth0: 00:11:25:c4:52:ba
mac_eth1: 00:11:25:c4:52:bb
mac_eth2: 00:10:18:06:4e:db
mac_bmc: 00:11:25:91:48:ED
netgdx-27:
comments: "Boot aborts because of tg3 driver : 'could not obtain valid ethernet address, aborting. probe of 0000:03:02.0 failed with error -22'"
mac_eth0: 00:11:25:1E:79:08
mac_eth1: 00:11:25:1E:79:09
mac_eth2: 00:10:18:06:4F:A7
mac_bmc: 00:11:25:91:46:34
netgdx-28:
mac_eth0: 00:11:25:c4:4d:28
mac_eth1: 00:11:25:c4:4d:29
mac_eth2: 00:10:18:06:4f:ae
mac_bmc: 00:11:25:91:47:48
netgdx-29:
mac_eth0: 00:11:25:c4:4f:9e
mac_eth1: 00:11:25:c4:4f:9f
mac_eth2: 00:10:18:06:4f:b5
mac_bmc: 00:11:25:91:45:F3
netgdx-2:
mac_eth0: 00:11:25:c4:52:bc
mac_eth1: 00:11:25:c4:52:bd
mac_eth2: 00:10:18:16:50:6c
mac_bmc: 00:11:25:91:47:B2
netgdx-30: