Commit a94cf4bd authored by Philippe Combes's avatar Philippe Combes
Browse files

[toulouse][lyon] Minor, no need to regenerate.

parent dee53b9a
...@@ -131,7 +131,6 @@ site :lyon do |site_uid| ...@@ -131,7 +131,6 @@ site :lyon do |site_uid|
:management => false, :management => false,
:mountable => false, :mountable => false,
:driver => 'tg3', :driver => 'tg3',
:mounted => false,
:network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr") :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
},{ },{
......
...@@ -53,8 +53,8 @@ site :toulouse do |site_uid| ...@@ -53,8 +53,8 @@ site :toulouse do |site_uid|
storage_devices [ storage_devices [
{:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"} {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
] ]
network_adapters [ network_adapters [{
{ :interface => 'Ethernet', :interface => 'Ethernet',
:rate => 1.G, :rate => 1.G,
:mac => lookup('toulouse-violette', node_uid, 'mac_eth0'), :mac => lookup('toulouse-violette', node_uid, 'mac_eth0'),
:vendor => "Broadcom", :vendor => "Broadcom",
...@@ -69,8 +69,8 @@ site :toulouse do |site_uid| ...@@ -69,8 +69,8 @@ site :toulouse do |site_uid|
:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:ip6 => nil, :ip6 => nil,
:switch => "cict-switch" :switch => "cict-switch"
}, },{
{ :interface => 'Ethernet', :interface => 'Ethernet',
:rate => 1.G, :rate => 1.G,
:mac => lookup('toulouse-violette', node_uid, 'mac_eth1'), :mac => lookup('toulouse-violette', node_uid, 'mac_eth1'),
:vendor => "Broadcom", :vendor => "Broadcom",
...@@ -81,8 +81,8 @@ site :toulouse do |site_uid| ...@@ -81,8 +81,8 @@ site :toulouse do |site_uid|
:mounted => false, :mounted => false,
:device => "eth1", :device => "eth1",
:switch => nil :switch => nil
}, },{
{ :interface => 'Ethernet', :interface => 'Ethernet',
:rate => 1.G, :rate => 1.G,
:mac => lookup('toulouse-violette', node_uid, 'mac_ipmi'), :mac => lookup('toulouse-violette', node_uid, 'mac_ipmi'),
:vendor => "?", :vendor => "?",
...@@ -95,8 +95,7 @@ site :toulouse do |site_uid| ...@@ -95,8 +95,7 @@ site :toulouse do |site_uid|
:ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"), :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
:ip6 => nil, :ip6 => nil,
:switch => 'cict-switch' :switch => 'cict-switch'
} }]
]
end end
end end
end end
......
Supports Markdown
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