Commit cbdc05ff authored by Jérémie Gaidamour's avatar Jérémie Gaidamour

Edited the g5k:generate rule of the Rakefile. It now passes...

Edited the g5k:generate rule of the Rakefile. It now passes clustername/nodes/*.yaml to the generator instead of clustername_generated.yaml.
Also modified lookup() calls in the .rb file of each cluster using:
 for i in $(find . -iname "*.rb"); do name=$(basename $i .rb); sed -i "s/lookup('"$name"_generated', /lookup(node_uid, /g" $i; done
parent 82cff7cc
......@@ -53,9 +53,9 @@ namespace :g5k do
root_dir_input = "#{ROOT_DIR}/generators/input/sites"
command = File.join(ROOT_DIR, "generators", "grid5000")
command += " " + File.join(root_dir_input, site,"#{site}.rb")
command += " " + File.join(root_dir_input, site,"clusters","#{host}.rb")
command += " " + File.join(root_dir_input, site,"clusters","#{host}_generated.yaml")
command += " " + File.join(root_dir_input, site,"clusters","#{host}_manual.yaml")
command += " " + File.join(root_dir_input, site,"clusters", "*", "#{host}.rb")
command += " " + File.join(root_dir_input, site,"clusters", "*", "nodes", "#{host}*.yaml")
command += " " + File.join(root_dir_input, site,"clusters", "*", "#{host}_manual.yaml")
command += " " + File.join(root_dir_input, site,"pdus.rb")
command << " -s" if ENV['DRY'] == "yes"
......
......@@ -17,31 +17,31 @@ site :grenoble do |site_uid|
supported_job_types({
:deploy => true,
:besteffort => true,
:virtual => lookup('adonis_generated', node_uid, 'supported_job_types', 'virtual')
:virtual => lookup(node_uid, node_uid, 'supported_job_types', 'virtual')
})
architecture({
:smp_size => lookup('adonis_generated', node_uid, 'architecture', 'smp_size'),
:smt_size => lookup('adonis_generated', node_uid, 'architecture', 'smt_size'),
:platform_type => lookup('adonis_generated', node_uid, 'architecture', 'platform_type')
:smp_size => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
:smt_size => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
:platform_type => lookup(node_uid, node_uid, 'architecture', 'platform_type')
})
processor({
:vendor => lookup('adonis_generated', node_uid, 'processor', 'vendor'),
:model => lookup('adonis_generated', node_uid, 'processor', 'model'),
:version => lookup('adonis_generated', node_uid, 'processor', 'version'),
:clock_speed => lookup('adonis_generated', node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup('adonis_generated', node_uid, 'processor', 'instruction_set'),
:other_description => lookup('adonis_generated', node_uid, 'processor', 'other_description'),
:cache_l1 => lookup('adonis_generated', node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup('adonis_generated', node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup('adonis_generated', node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup('adonis_generated', node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup('adonis_generated', node_uid, 'processor', 'cache_l3')
:vendor => lookup(node_uid, node_uid, 'processor', 'vendor'),
:model => lookup(node_uid, node_uid, 'processor', 'model'),
:version => lookup(node_uid, node_uid, 'processor', 'version'),
:clock_speed => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
:other_description => lookup(node_uid, node_uid, 'processor', 'other_description'),
:cache_l1 => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup(node_uid, node_uid, 'processor', 'cache_l3')
})
main_memory({
:ram_size => lookup('adonis_generated', node_uid, 'main_memory', 'ram_size'),
:ram_size => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
:virtual_size => nil
})
......@@ -54,63 +54,63 @@ site :grenoble do |site_uid|
storage_devices [{
:interface => 'SATA',
:size => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'size'),
:size => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
:driver => "ahci",
:device => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'device'),
:model => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup('adonis_generated', node_uid, 'block_devices', 'sda', 'rev'),
:device => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
:model => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
:storage => 'HDD'
}]
network_adapters [{
:interface => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
:enabled => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
:bridged => true,
:device => "eth0",
:vendor => 'Intel',
:version => "Device 10c9 (rev 01)",
:driver => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
:switch => net_switch_lookup('grenoble', 'adonis', node_uid, 'eth0'),
:switch_port => net_port_lookup('grenoble', 'adonis', node_uid, 'eth0'),
:mac => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
},
{
:interface => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
:rate => 1.G,
:enabled => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
:bridged => false,
:device => "eth1",
:vendor => 'Intel',
:version => "Device 10c9 (rev 01)",
:driver => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup('adonis_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
},
{
:interface => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
:device => "ib0",
:enabled => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
:vendor => 'Mellanox',
:version => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
:version => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
:ip => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
:ip6 => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
:guid => lookup('adonis_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
:guid => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
},
{
:interface => 'Ethernet',
......@@ -121,22 +121,22 @@ site :grenoble do |site_uid|
:mounted => false,
:device => "bmc",
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:ip => lookup('adonis_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
:vendor => 'Super Micro Computer Inc.',
:version => "1.15",
:mac => lookup('adonis_generated', node_uid, 'network_interfaces', 'bmc', 'mac')
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac')
}]
chassis({
:serial => lookup('adonis_generated', node_uid, 'chassis', 'serial_number'),
:name => lookup('adonis_generated', node_uid, 'chassis', 'product_name'),
:manufacturer => lookup('adonis_generated', node_uid, 'chassis', 'manufacturer')
:serial => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
:name => lookup(node_uid, node_uid, 'chassis', 'product_name'),
:manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
})
bios({
:version => lookup('adonis_generated', node_uid, 'bios', 'version'),
:vendor => lookup('adonis_generated', node_uid, 'bios', 'vendor'),
:release_date => lookup('adonis_generated', node_uid, 'bios', 'release_date')
:version => lookup(node_uid, node_uid, 'bios', 'version'),
:vendor => lookup(node_uid, node_uid, 'bios', 'vendor'),
:release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
})
gpu({
......
......@@ -17,31 +17,31 @@ site :grenoble do |site_uid|
supported_job_types({
:deploy => true,
:besteffort => true,
:virtual => lookup('edel_generated', node_uid, 'supported_job_types', 'virtual')
:virtual => lookup(node_uid, node_uid, 'supported_job_types', 'virtual')
})
architecture({
:smp_size => lookup('edel_generated', node_uid, 'architecture', 'smp_size'),
:smt_size => lookup('edel_generated', node_uid, 'architecture', 'smt_size'),
:platform_type => lookup('edel_generated', node_uid, 'architecture', 'platform_type')
:smp_size => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
:smt_size => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
:platform_type => lookup(node_uid, node_uid, 'architecture', 'platform_type')
})
processor({
:vendor => lookup('edel_generated', node_uid, 'processor', 'vendor'),
:model => lookup('edel_generated', node_uid, 'processor', 'model'),
:version => lookup('edel_generated', node_uid, 'processor', 'version'),
:clock_speed => lookup('edel_generated', node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup('edel_generated', node_uid, 'processor', 'instruction_set'),
:other_description => lookup('edel_generated', node_uid, 'processor', 'other_description'),
:cache_l1 => lookup('edel_generated', node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup('edel_generated', node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup('edel_generated', node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup('edel_generated', node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup('edel_generated', node_uid, 'processor', 'cache_l3')
:vendor => lookup(node_uid, node_uid, 'processor', 'vendor'),
:model => lookup(node_uid, node_uid, 'processor', 'model'),
:version => lookup(node_uid, node_uid, 'processor', 'version'),
:clock_speed => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
:other_description => lookup(node_uid, node_uid, 'processor', 'other_description'),
:cache_l1 => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup(node_uid, node_uid, 'processor', 'cache_l3')
})
main_memory({
:ram_size => lookup('edel_generated', node_uid, 'main_memory', 'ram_size'),
:ram_size => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
:virtual_size => nil
})
......@@ -54,77 +54,77 @@ site :grenoble do |site_uid|
storage_devices [{
:interface => 'SATA',
:size => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'size'),
:size => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
:driver => "ahci",
:device => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'device'),
:model => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup('edel_generated', node_uid, 'block_devices', 'sda', 'rev'),
:device => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
:model => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
:storage => 'SSD'
}]
network_adapters [{
:interface => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'rate'),
:enabled => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
:bridged => true,
:device => "eth0",
:vendor => 'Intel',
:version => "82576 Gigabit Network Connection",
:driver => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
:switch => net_switch_lookup('grenoble', 'edel', node_uid),
:switch_port => net_port_lookup('grenoble', 'edel', node_uid),
:mac => lookup('edel_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
},
{
:interface => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
:rate => 1.G,
:enabled => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
:bridged => false,
:device => "eth1",
:vendor => 'Intel',
:version => "82576 Gigabit Network Connection",
:driver => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup('edel_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
},
{
:interface => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
:device => "ib0",
:enabled => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
:vendor => 'Mellanox',
:version => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
:version => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
:network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
:ip => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'ip'),
:ip6 => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'ip6'),
:guid => lookup('edel_generated', node_uid, 'network_interfaces', 'ib0', 'guid')
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
:guid => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
},
{
:interface => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
:rate => 40.G,
:rate => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'rate'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
:device => "ib1",
:enabled => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'enabled'),
:management => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'management'),
:mountable => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'mountable'),
:mounted => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
:vendor => 'Mellanox',
:version => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'version'),
:driver => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'driver'),
:guid => lookup('edel_generated', node_uid, 'network_interfaces', 'ib1', 'guid')
:version => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
:guid => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
},
{
:interface => 'Ethernet',
......@@ -135,22 +135,22 @@ site :grenoble do |site_uid|
:mounted => false,
:device => "bmc",
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:ip => lookup('edel_generated', node_uid, 'network_interfaces', 'bmc', 'ip'),
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
:vendor => "Unknown",
:version => "1.7",
:mac => lookup('edel_generated', node_uid, 'network_interfaces', 'bmc', 'mac')
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac')
}]
chassis({
:serial => lookup('edel_generated', node_uid, 'chassis', 'serial_number'),
:name => lookup('edel_generated', node_uid, 'chassis', 'product_name'),
:manufacturer => lookup('edel_generated', node_uid, 'chassis', 'manufacturer')
:serial => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
:name => lookup(node_uid, node_uid, 'chassis', 'product_name'),
:manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
})
bios({
:version => lookup('edel_generated', node_uid, 'bios', 'version'),
:vendor => lookup('edel_generated', node_uid, 'bios', 'vendor'),
:release_date => lookup('edel_generated', node_uid, 'bios', 'release_date')
:version => lookup(node_uid, node_uid, 'bios', 'version'),
:vendor => lookup(node_uid, node_uid, 'bios', 'vendor'),
:release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
})
gpu({
......
......@@ -17,31 +17,31 @@ site :grenoble do |site_uid|
supported_job_types({
:deploy => true,
:besteffort => true,
:virtual => lookup('genepi_generated', node_uid, 'supported_job_types', 'virtual')
:virtual => lookup(node_uid, node_uid, 'supported_job_types', 'virtual')
})
architecture({
:smp_size => lookup('genepi_generated', node_uid, 'architecture', 'smp_size'),
:smt_size => lookup('genepi_generated', node_uid, 'architecture', 'smt_size'),
:platform_type => lookup('genepi_generated', node_uid, 'architecture', 'platform_type')
:smp_size => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
:smt_size => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
:platform_type => lookup(node_uid, node_uid, 'architecture', 'platform_type')
})
processor({
:vendor => lookup('genepi_generated', node_uid, 'processor', 'vendor'),
:model => lookup('genepi_generated', node_uid, 'processor', 'model'),
:version => lookup('genepi_generated', node_uid, 'processor', 'version'),
:clock_speed => lookup('genepi_generated', node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup('genepi_generated', node_uid, 'processor', 'instruction_set'),
:other_description => lookup('genepi_generated', node_uid, 'processor', 'other_description'),
:cache_l1 => lookup('genepi_generated', node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup('genepi_generated', node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup('genepi_generated', node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup('genepi_generated', node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup('genepi_generated', node_uid, 'processor', 'cache_l3')
:vendor => lookup(node_uid, node_uid, 'processor', 'vendor'),
:model => lookup(node_uid, node_uid, 'processor', 'model'),
:version => lookup(node_uid, node_uid, 'processor', 'version'),
:clock_speed => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
:instruction_set => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
:other_description => lookup(node_uid, node_uid, 'processor', 'other_description'),
:cache_l1 => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
:cache_l1i => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
:cache_l1d => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
:cache_l2 => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
:cache_l3 => lookup(node_uid, node_uid, 'processor', 'cache_l3')
})
main_memory({
:ram_size => lookup('genepi_generated', node_uid, 'main_memory', 'ram_size'),
:ram_size => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
:virtual_size => nil
})
......@@ -54,77 +54,77 @@ site :grenoble do |site_uid|
storage_devices [{
:interface => 'SATA',
:size => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'size'),
:size => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
:driver => "ata_piix",
:device => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'device'),
:model => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup('genepi_generated', node_uid, 'block_devices', 'sda', 'rev'),
:device => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
:model => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
:vendor => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
:rev => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
:storage => 'HDD'
}]
network_adapters [{
:interface => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => 1.G,
:enabled => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
:bridged => false,
:device => "eth0",
:vendor => 'Intel',
:version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
:driver => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
:mac => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
},
{
:interface => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
:rate => 1.G,
:enabled => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
:bridged => true,
:device => "eth1",
:vendor => 'Intel',
:version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
:ip => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
:ip6 => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:switch => net_switch_lookup('grenoble', 'genepi', node_uid, 'eth1'),
:switch_port => net_port_lookup('grenoble', 'genepi', node_uid, 'eth1'),
:driver => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup('genepi_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
},
{
:interface => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'rate'),
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
:device => "ib0",
:enabled => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'mounted'),
:enabled => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
:mounted => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
:vendor => 'Mellanox',
:version => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup('genepi_generated', node_uid, 'network_interfaces', 'ib0', 'driver'),
:version => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),