diff --git a/generators/input/lyon.rb b/generators/input/lyon.rb index 02869a3fad7f4a8679ed6e98662cc139ef3e91fa..69c1d1d3b0a199b2fb86e6accb3fcfa88d0f2fb9 100755 --- a/generators/input/lyon.rb +++ b/generators/input/lyon.rb @@ -131,7 +131,6 @@ site :lyon do |site_uid| :management => false, :mountable => false, :driver => 'tg3', - :mounted => false, :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr") },{ diff --git a/generators/input/toulouse.rb b/generators/input/toulouse.rb index 78072c357fa3d8db471d20ebfac3fa54b8255b21..ebe45b3577f4eb5a6748b4b5c951676d911fba94 100755 --- a/generators/input/toulouse.rb +++ b/generators/input/toulouse.rb @@ -53,8 +53,8 @@ site :toulouse do |site_uid| storage_devices [ {:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"} ] - network_adapters [ - { :interface => 'Ethernet', + network_adapters [{ + :interface => 'Ethernet', :rate => 1.G, :mac => lookup('toulouse-violette', node_uid, 'mac_eth0'), :vendor => "Broadcom", @@ -69,8 +69,8 @@ site :toulouse do |site_uid| :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), :ip6 => nil, :switch => "cict-switch" - }, - { :interface => 'Ethernet', + },{ + :interface => 'Ethernet', :rate => 1.G, :mac => lookup('toulouse-violette', node_uid, 'mac_eth1'), :vendor => "Broadcom", @@ -81,8 +81,8 @@ site :toulouse do |site_uid| :mounted => false, :device => "eth1", :switch => nil - }, - { :interface => 'Ethernet', + },{ + :interface => 'Ethernet', :rate => 1.G, :mac => lookup('toulouse-violette', node_uid, 'mac_ipmi'), :vendor => "?", @@ -95,8 +95,7 @@ site :toulouse do |site_uid| :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"), :ip6 => nil, :switch => 'cict-switch' - } - ] + }] end end end