Commit d0800487 authored by Sebastien Badia's avatar Sebastien Badia
Browse files

[nancy] Switch to refget yaml struct (add talc in local branch)

parent 834173be
......@@ -6,7 +6,7 @@ site :nancy do |site_uid|
144.times do |i|
node "#{cluster_uid}-#{i+1}" do |node_uid|
serial lookup('nancy-graphene', node_uid, 'serial')
serial lookup('nancy-graphene', node_uid, 'chassis', 'serial_number')
supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
architecture({
:smp_size => 1,
......@@ -35,14 +35,14 @@ site :nancy do |site_uid|
:version => nil,
:kernel => "2.6.32"
})
storage_devices [{
storage_devices ({
:interface => 'SATA II',
:size => 320.GB,
:driver => "ahci",
:device => "sda",
:model => lookup('nancy-graphene', node_uid, 'disk_model'),
:rev => lookup('nancy-graphene', node_uid, 'disk_rev')
}]
:model => lookup('nancy-graphene', node_uid, 'block_devices' ,'sda', 'model'),
:rev => lookup('nancy-graphene', node_uid, 'block_devices', 'sda', 'rev'),
})
network_adapters [{
:interface => 'Ethernet',
:rate => 1.G,
......@@ -51,12 +51,11 @@ site :nancy do |site_uid|
:mounted => true,
:mountable => true,
:management => false,
:switch => lookup('nancy-graphene', "#{node_uid}", 'switch_eth0'),
:mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth0'),
:switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_pos_eth0'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
#:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:ip => lookup('nancy-graphene', node_uid, 'ip_eth0'),
:ip => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth0', 'ip'),
:mac => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth0', 'mac'),
:switch => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
:switch_port => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
:driver => "e1000e",
:vendor => "intel",
:version => "82574L"
......@@ -67,7 +66,7 @@ site :nancy do |site_uid|
#:device => "eth1",
:enabled => false,
#:mounted => false,
:mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth1'),
:mac => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth1', 'mac'),
#:management => false,
#:driver => "e1000e",
:vendor => "intel",
......@@ -79,7 +78,7 @@ site :nancy do |site_uid|
#:device => "eth2",
:enabled => false,
#:mounted => false,
:mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth2'),
:mac => lookup('nancy-graphene', node_uid, 'network_interfaces', 'eth2', 'mac'),
#:management => false,
#:driver => "e1000e",
:vendor => "intel",
......@@ -93,15 +92,15 @@ site :nancy do |site_uid|
:mounted => true,
:mountable => true,
:management => false,
:ip => lookup('nancy-graphene', "#{node_uid}", 'ip_ib'),
:ip => lookup('nancy-graphene', node_uid, 'network_interfaces', 'ib0', 'ip'),
:guid => lookup('nancy-graphene', node_uid, 'network_interfaces', 'ib0', 'guid'),
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
:switch => "sgrapheneib",
#:ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'),
#:ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'),
:driver => "mlx4_core",
:vendor => "Mellanox",
:version => "MT26418",
:mac => lookup('nancy-graphene', node_uid, 'guidib0')
:version => "MT26418"
},
{
:interface => 'InfiniBand',
......@@ -114,7 +113,7 @@ site :nancy do |site_uid|
#:mountable => false,
#:mounted => false,
#:management => false
:mac => lookup('nancy-graphene', node_uid, 'guidib1')
:guid => lookup('nancy-graphene', node_uid, 'network_interfaces', 'ib1', 'guid')
},
{
:interface => 'Ethernet',
......@@ -126,21 +125,21 @@ site :nancy do |site_uid|
:vendor => "Tyan",
:version => "AST2050",
:device => "bmc",
:ip => lookup('nancy-graphene', "#{node_uid}", 'ip_mgt'),
:ip => lookup('nancy-graphene', node_uid, 'network_interfaces', 'bmc', 'ip'),
:mac => lookup('nancy-graphene', node_uid, 'network_interfaces', 'bmc', 'mac'),
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:switch => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi'),
:switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi_pos'),
:mac => lookup('nancy-graphene', "#{node_uid}", 'mac_mgt'),
:switch => lookup('nancy-graphene', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
:switch_port => lookup('nancy-graphene', node_uid, 'network_interfaces', 'bmc', 'switch_port')
}]
pdu({
:vendor => "American Power Conversion",
:pdu => lookup('nancy-graphene', "#{node_uid}", 'pdu'),
:pdu_port => lookup('nancy-graphene', "#{node_uid}", 'pdu_pos')
:pdu => lookup('nancy-graphene', node_uid, 'pdu', 'pdu_name'),
:pdu_port => lookup('nancy-graphene', node_uid, 'pdu', 'pdu_position')
})
bios({
:version => lookup('nancy-graphene', node_uid, 'bios_ver'),
:version => lookup('nancy-graphene', node_uid, 'bios', 'version'),
:vendor => "American Megatrends Inc.",
:release_date => lookup('nancy-graphene', node_uid, 'bios_release')
:release_date => lookup('nancy-graphene', node_uid, 'bios', 'release_date')
})
end
......
This diff is collapsed.
......@@ -5,7 +5,7 @@ site :nancy do |site_uid|
created_at Time.parse("2009-04-10").httpdate
92.times do |i|
node "#{cluster_uid}-#{i+1}" do |node_uid|
serial lookup('nancy-griffon', node_uid, 'serial')
serial lookup('nancy-griffon', node_uid, 'chassis', 'serial_number')
supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
architecture({
:smp_size => 2,
......@@ -34,14 +34,14 @@ site :nancy do |site_uid|
:version => nil,
:kernel => "2.6.32"
})
storage_devices [{
storage_devices ({
:interface => 'SATA II',
:size => 320.GB,
:driver => "ata_piix",
:device => "sda",
:model => lookup('nancy-griffon', node_uid, 'disk_model'),
:rev => lookup('nancy-griffon', node_uid, 'disk_rev')
}]
:model => lookup('nancy-griffon', node_uid, 'block_devices', 'sda', 'model'),
:rev => lookup('nancy-griffon', node_uid, 'block_devices', 'sda', 'rev')
})
network_adapters [{
:interface => 'Ethernet',
:rate => 1.G,
......@@ -50,12 +50,11 @@ site :nancy do |site_uid|
:mounted => true,
:mountable => true,
:management => false,
:switch => lookup('nancy-griffon', "#{node_uid}", 'switch_eth0'),
:mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth0'),
:switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_pos_eth0'),
:switch => lookup('nancy-griffon', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
:switch_port => lookup('nancy-griffon', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
:mac => lookup('nancy-griffon', node_uid, 'network_interfaces', 'eth0', 'mac'),
:ip => lookup('nancy-griffon', node_uid, 'network_interfaces', 'eth0', 'ip'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
#:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:ip => lookup('nancy-griffon', node_uid, 'ip_eth0'),
:driver => "e1000e",
:vendor => "intel",
:version => "80003ES2LAN"
......@@ -65,7 +64,7 @@ site :nancy do |site_uid|
:rate => 1.G,
:enabled => false,
#:mounted => false,
:mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth1'),
:mac => lookup('nancy-griffon', node_uid, 'network_interfaces', 'eth1', 'mac'),
#:mountable => false,
#:management => false,
#:driver => "e1000e",
......@@ -80,13 +79,14 @@ site :nancy do |site_uid|
:mounted => true,
:mountable => true,
:management => false,
:ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ib'),
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
:ip => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib0', 'ip'),
:guid => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib0', 'guid'),
:hwid => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib0', 'hwid'),
:switch => "sgriffonib",
:ib_switch_card => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card'),
:ib_switch_card_pos => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card_pos'),
:driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418",
:mac => lookup('nancy-griffon', node_uid, 'guidib0')
:ib_switch_card => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib0', 'line_card'),
:ib_switch_card_pos => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib0', 'position'),
:driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418"
},
{
:interface => 'InfiniBand',
......@@ -97,7 +97,7 @@ site :nancy do |site_uid|
#:management => false,
:vendor => "Mellanox",
:version => "MT26418",
:mac => lookup('nancy-griffon', node_uid, 'guidib1')
:guid => lookup('nancy-griffon', node_uid, 'network_interfaces', 'ib1', 'guid'),
},
{
:interface => 'Ethernet',
......@@ -107,23 +107,23 @@ site :nancy do |site_uid|
:mountable => false,
:management => true,
:vendor => "Tyan", :version => "M3296",
:ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ipmi'),
:network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
:switch => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi'),
:switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi_pos'),
:mac => lookup('nancy-griffon', "#{node_uid}", 'mac_ipmi'),
:ip => lookup('nancy-griffon', node_uid, 'network_interfaces', 'bmc', 'ip'),
:mac => lookup('nancy-griffon', node_uid, 'network_interfaces', 'bmc', 'mac'),
:switch => lookup('nancy-griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
:switch_port => lookup('nancy-griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port')
}]
pdu({
:vendor => "American Power Conversion",
:pdu => lookup('nancy-griffon', "#{node_uid}", 'pdu'),
:pdu_port => lookup('nancy-griffon', "#{node_uid}", 'pdu_pos')
:pdu => lookup('nancy-griffon', node_uid, 'pdu', 'pdu_name'),
:pdu_port => lookup('nancy-griffon', node_uid, 'pdu', 'pdu_position'),
})
bios({
:version => lookup('nancy-griffon', node_uid, 'bios_ver'),
:vendor => "Phoenix Technologies LTD",
:release_date => lookup('nancy-griffon', node_uid, 'bios_release')
:version => lookup('nancy-griffon', node_uid, 'bios', 'version'),
:vendor => lookup('nancy-griffon', node_uid, 'bios', 'vendor'),
:release_date => lookup('nancy-griffon', node_uid, 'bios', 'release_date'),
})
end
end
end # cluster griffon
end
end # nancy
This diff is collapsed.
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