Commit 16390ab7 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

Merge branch 'master' into dev

Conflicts:
	generators/input/sites/nancy/clusters/griffon/griffon.rb
parents eb7256ce 6eb14768
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -104,7 +104,7 @@
"rate": 1000000000
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ib_ipoib",
"enabled": true,
......
......@@ -104,7 +104,7 @@
"rate": 1000000000
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ib_ipoib",
"enabled": true,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
{
"backplane_bps": null,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"linecards": [
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"kind": "switch",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"kind": "switch",
"uid": "sgriffonib"
}
],
"rate": 20000000000,
"snmp_pattern": "%LINECARD%/%PORT%"
}
],
"model": "Infiniband",
"mtu": null,
"routes": {
},
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraoullyib",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
"use_cacti": "no"
}
}
\ No newline at end of file
......@@ -163,9 +163,7 @@
},
{
"kind": "node",
"port": "eth2",
"uid": "griffon-11"
},
{
"kind": "switch",
......@@ -174,24 +172,6 @@
],
"rate": 10000000000,
"snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
},
{
"kind": "node",
"naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
"ports": [
{
},
{
},
{
"port": "eth2",
"uid": "griffon-12"
}
],
"rate": 10000000000,
"snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
}
],
"model": "3com 4500g",
......
......@@ -179,7 +179,7 @@ site :nancy do |site_uid|
:management => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
:mountable => true,
:mounted => true,
:bridged => true,
:bridged => false,
:device => "ib0",
:vendor => 'Mellanox',
:model => 'MT27500 Family [ConnectX-3]',
......
site :nancy do |site_uid|
cluster :griffon do |cluster_uid|
model "Carri System CS-5393B"
created_at Time.parse("2009-04-10").httpdate
kavlan true
queues ['admin', 'default']
([*0..28]+[*57..59]).each do |i|
node "#{cluster_uid}-#{i+1}" do |node_uid|
performance({
:core_flops => 7.963.G,
:node_flops => 52.5.G
})
supported_job_types({
:deploy => true,
:besteffort => true,
:max_walltime => 0,
:virtual => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
:queues => ['admin', 'default']
})
architecture({
: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(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(node_uid, node_uid, 'main_memory', 'ram_size'),
:virtual_size => nil
})
operating_system({
:name => lookup(node_uid, node_uid, 'operating_system', 'name'),
:release => "Jessie",
:version => lookup(node_uid, node_uid, 'operating_system', 'version'),
:kernel => lookup(node_uid, node_uid, 'operating_system', 'kernel')
})
storage_devices [{
:interface => 'SATA II',
:size => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
:driver => "ahci",
: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'
}]
if (11<=i+1 and i+1<=14) then
network_adapters [{
: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 => "80003ES2LAN",
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
:switch => net_switch_lookup('nancy','griffon', node_uid),
:switch_port => net_port_lookup('nancy','griffon', node_uid),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
:rate => 1.G,
: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 => "BCM5721",
:switch => net_switch_lookup('nancy','griffon', node_uid, 'eth1'),
:switch_port => net_port_lookup('nancy','griffon', node_uid, 'eth1'),
:driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
},
{
:interface => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'),
:rate => 10.G,
:enabled => false, # see bug 6490,
:management => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'management'),
:mountable => false, # see bug 6490,
:mounted => false, # see bug 6490,
:bridged => false,
:device => "eth2",
:vendor => "myrinet",
:version => "Myri-10G",
:driver => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'driver'),
:mac => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac')
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
:device => "ib0",
: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(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(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'),
:switch => "sgriffonib",
:ib_switch_card => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
:ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
:hwid => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
},
{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
:device => "ib1",
: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(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',
:rate => 100.M,
:network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
:ip => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
:mac => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
:switch => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
:switch_port => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
:enabled => true,
:mounted => false,
:mountable => false,
:management => true,
:device => "bmc",
:vendor => "Tyan",
:version => "M3296"