Commit d7c0c9e9 authored by Cyril Rohr's avatar Cyril Rohr
Browse files

Must now distinctively use GiB and GB. See...

Must now distinctively use GiB and GB. See http://en.wikipedia.org/wiki/Binary_prefix Introduced K,M,G,T instead of kilo,mega,giga,tera.
parent c3b37e1d
......@@ -3,8 +3,8 @@ site :bordeaux do |site_uid|
location "Bordeaux, France"
web "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
description "Grid5000 Bordeaux site"
latitude "44° 50’ 18’’ Nord"
longitude "Nord 0° 34’ 41’’ Ouest"
latitude 44.833333
longitude -0.566667
email_contact "bordeaux-staff@lists.grid5000.fr"
sys_admin_contact "bordeaux-staff@lists.grid5000.fr"
security_contact "bordeaux-staff@lists.grid5000.fr"
......@@ -30,16 +30,16 @@ version 1.48"
:vendor => "AMD",
:model => "AMD Opteron",
:version => "248",
:clock_speed => 2.2.giga,
:clock_speed => 2.2.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => "64K",
:cache_l1d => "64K",
:cache_l2 => 1.MB
:cache_l1i => 64.KiB,
:cache_l1d => 64.KiB,
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 2.GB(true), # bytes
:ram_size => 2.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -48,14 +48,14 @@ version 1.48"
:version => nil
})
storage_devices [
{:interface => 'IDE', :size => 80.GB(false), :driver => "amd74xx"}
{:interface => 'IDE', :size => 80.GB, :driver => "amd74xx"}
]
network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga,
{:interface => 'Myri-2000', :rate => 2.G,
:switch => "sbdm", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXD-2", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "tg3"}
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3"},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "tg3"}
]
end
end
......@@ -77,16 +77,16 @@ version 1.48"
:vendor => "Intel",
:model => "Intel Xeon",
:version => "EM64T",
:clock_speed => 3.giga,
:clock_speed => 3.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => "16K",
:cache_l2 => 1.MB
:cache_l1d => 16.KiB,
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 2.GB(true), # bytes
:ram_size => 2.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -95,14 +95,14 @@ version 1.48"
:version => nil
})
storage_devices [
{:interface => 'SCSI', :size => 70.GB(false), :driver => "mptspi"}
{:interface => 'SCSI', :size => 70.GB, :driver => "mptspi"}
]
network_adapters [
{:interface => 'InfiniBand', :rate => 10.giga,
{:interface => 'InfiniBand', :rate => 10.G,
:switch => "sbdp", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'InfiniHost', :version => "MT25208", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"}
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
]
end
end
......@@ -124,16 +124,16 @@ version 1.48"
:vendor => "AMD",
:model => "Dual-Core AMD Opteron Processor",
:version => "2218",
:clock_speed => 2.6.giga,
:clock_speed => 2.6.G,
:instruction_set => "x86-64",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => "64K",
:cache_l1d => "64K",
:cache_l2 => 1.MB
:cache_l1i => 64.KiB,
:cache_l1d => 64.KiB,
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 4.GB(true), # bytes
:ram_size => 4.GiB,
:virtual_size => nil
})
operating_system({
......@@ -142,13 +142,13 @@ version 1.48"
:version => nil
})
storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"}
{:interface => 'SATA', :size => 80.GB, :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"}
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"}
]
end
end
......@@ -170,16 +170,16 @@ version 1.48"
:vendor => "AMD",
:model => "Dual-Core AMD Opteron Processor 8218",
:version => "2218",
:clock_speed => 2.6.giga,
:clock_speed => 2.6.G,
:instruction_set => "x86-64",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => "64K",
:cache_l1d => "64K",
:cache_l2 => 2.MB
:cache_l1i => 64.KiB,
:cache_l1d => 64.KiB,
:cache_l2 => 2.MiB
})
main_memory({
:ram_size => 32.GB(true), # bytes
:ram_size => 32.GiB,
:virtual_size => nil
})
operating_system({
......@@ -188,17 +188,17 @@ version 1.48"
:version => "5.0"
})
storage_devices [
{:interface => 'SAS', :size => 600.GB(false), :driver => nil}
{:interface => 'SAS', :size => 600.GB, :driver => nil}
]
network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga,
{:interface => 'Myri-10G', :rate => 10.G,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'InfiniBand', :rate => 10.giga, :vendor => 'InfiniHost', :version => "MT25408", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false, :driver => "e1000"}
{:interface => 'InfiniBand', :rate => 10.G, :vendor => 'InfiniHost', :version => "MT25408", :enabled => true},
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
]
end
end
end # cluster borderline
end
\ No newline at end of file
end
......@@ -10,7 +10,7 @@ environment 'sid-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'sid-x64-base-1.1' do
......@@ -25,7 +25,7 @@ environment 'sid-x64-base-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'sid-x64-nfs-1.0' do
......@@ -40,7 +40,7 @@ environment 'sid-x64-nfs-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'sid-x64-nfs-1.1' do
......@@ -55,7 +55,7 @@ environment 'sid-x64-nfs-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'sid-x64-big-1.1' do
......@@ -70,7 +70,7 @@ environment 'sid-x64-big-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-base-1.0' do
......@@ -85,7 +85,7 @@ environment 'etch-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-base-1.1' do
......@@ -100,7 +100,7 @@ environment 'etch-x64-base-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-nfs-1.0' do
......@@ -115,7 +115,7 @@ environment 'etch-x64-nfs-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-nfs-1.1' do
......@@ -130,7 +130,7 @@ environment 'etch-x64-nfs-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-big-1.0' do
......@@ -145,7 +145,7 @@ environment 'etch-x64-big-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-big-1.1' do
......@@ -160,7 +160,7 @@ environment 'etch-x64-big-1.1' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'etch-x64-xen-1.0' do
......@@ -175,7 +175,7 @@ environment 'etch-x64-xen-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'lenny-x64-base-0.9' do
......@@ -190,7 +190,7 @@ environment 'lenny-x64-base-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'lenny-x64-base-1.0' do
......@@ -205,7 +205,7 @@ environment 'lenny-x64-base-1.0' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'lenny-x64-nfs-0.9' do
......@@ -220,7 +220,7 @@ environment 'lenny-x64-nfs-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
environment 'lenny-x64-big-0.9' do
......@@ -235,5 +235,5 @@ environment 'lenny-x64-big-0.9' do
applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
x11_forwarding true
max_open_files 8192
tcp_bandwidth 1.giga
tcp_bandwidth 1.G
end
\ No newline at end of file
......@@ -29,7 +29,7 @@ site :grenoble do |site_uid|
:vendor => "Intel",
:model => "Intel Xeon",
:version => "E5420 QC",
:clock_speed => 2.5.giga,
:clock_speed => 2.5.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
......@@ -38,7 +38,7 @@ site :grenoble do |site_uid|
:cache_l2 => nil
})
main_memory({
:ram_size => 8.GB(true), # bytes
:ram_size => 8.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -47,12 +47,12 @@ site :grenoble do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => nil}
{:interface => 'SATA', :size => 160.GB, :driver => nil}
]
network_adapters [
{:interface => 'InfiniBand 10G', :rate => 10.giga, :enabled => true,
{:interface => 'InfiniBand 10G', :rate => 10.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false}
{:interface => 'Ethernet', :rate => 1.G, :enabled => false}
]
end
end
......
......@@ -29,7 +29,7 @@ site :rennes do |site_uid| # General description of the site.
# describes the architecture of the node
architecture({
:smp_size => 2, # number of physical CPUs
:smt_size => 4, # number of logical CPUs (cores)
:smt_size => 4, # total number of logical CPUs (cores)
:platform_type => "x86_64"
})
# describes the processors
......@@ -37,7 +37,7 @@ site :rennes do |site_uid| # General description of the site.
:vendor => "Intel",
:model => "Intel Xeon",
:version => "5148 LV",
:clock_speed => 2.33.giga, # giga = 10^9
:clock_speed => 2.33.G, # G = 10^9, M = 10^6, etc.
:instruction_set => "", # x86-64, IA-64, ...
:other_description => "",
:cache_l1 => nil, # first-level unified cache size of the processor
......@@ -46,7 +46,7 @@ site :rennes do |site_uid| # General description of the site.
:cache_l2 => nil # second-level unified cache size of the processor
})
main_memory({
:ram_size => 4.GB(true), # the amount of RAM (indicating true means "true bytes" (multiple of 2^10))
:ram_size => 4.GiB, # the amount of RAM. MAKE SURE YOU USE GiB or MiB or KiB, and not GB, MB, KB...
:virtual_size => nil # the amount of virtual memory (RAM+Swap)
})
# Information about the default operating system of the node
......@@ -62,21 +62,22 @@ site :rennes do |site_uid| # General description of the site.
:version => nil # version of the operating system
})
# Describes the list of storage devices available on the node
# Notice the use of ***GB*** (and not GiB)
# Required properties include: :interface, :size
# You may add the :driver property, or a :raid property (e.g. :raid => "0") if needed.
storage_devices [
{:interface => 'SATA', :size => 160.GB(false), :driver => "mptsas"}
{:interface => 'SATA', :size => 160.GB, :driver => "mptsas"}
]
# Describes the list of network adapters available on the node
# Required properties include: :interface, :rate, :switch, :network_address, :ip, :enabled
# You may add properties such as: :driver, :vendor, :version
# You may include adapters reserved for management (in this case, set enabled to false)
network_adapters [
{:interface => 'Myri-10G', :rate => 10.giga,
{:interface => 'Myri-10G', :rate => 10.G,
:switch => "c6509-grid", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => false}
{:interface => 'Ethernet', :rate => 1.G, :enabled => true},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false}
]
end
end
......
......@@ -29,16 +29,16 @@ site :lille do |site_uid|
:vendor => "AMD",
:model => "AMD Opteron",
:version => "248",
:clock_speed => 2.2.giga,
:clock_speed => 2.2.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MB
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 4.GB(true), # bytes
:ram_size => 4.GiB,
:virtual_size => nil
})
operating_system({
......@@ -47,10 +47,10 @@ site :lille do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_sil"}
{:interface => 'SATA', :size => 80.GB, :driver => "sata_sil"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"}
]
......@@ -74,16 +74,16 @@ site :lille do |site_uid|
:vendor => "AMD",
:model => "AMD Opteron",
:version => "252",
:clock_speed => 2.6.giga,
:clock_speed => 2.6.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MB
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 4.GB(true), # bytes
:ram_size => 4.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -92,10 +92,10 @@ site :lille do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw"}
{:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"}
]
......@@ -118,16 +118,16 @@ site :lille do |site_uid|
:vendor => "AMD",
:model => "AMD Opteron",
:version => "285",
:clock_speed => 2.6.giga,
:clock_speed => 2.6.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MB
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 4.GB(true), # bytes
:ram_size => 4.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -136,10 +136,10 @@ site :lille do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SATA', :size => 80.GB(false), :driver => "sata_svw"}
{:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "switch1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"}
]
......@@ -162,16 +162,16 @@ site :lille do |site_uid|
:vendor => "Intel",
:model => "Intel Xeon",
:version => "E5440 QC",
:clock_speed => 2.83.giga,
:clock_speed => 2.83.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 4.MB
:cache_l2 => 4.MiB
})
main_memory({
:ram_size => 8.GB(true), # bytes
:ram_size => 8.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -180,10 +180,10 @@ site :lille do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SATA II', :size => 250.GB(false), :driver => "ahci"}
{:interface => 'SATA II', :size => 250.GB, :driver => "ahci"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "e1000"}
]
......
......@@ -29,16 +29,16 @@ site :lyon do |site_uid|
:vendor => "AMD",
:model => "AMD Opteron",
:version => "246",
:clock_speed => 2.giga,
:clock_speed => 2.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MB
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 2.GB(true), # bytes
:ram_size => 2.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -47,13 +47,13 @@ site :lyon do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'IDE', :size => 80.GB(false), :driver => "amd74xx"}
{:interface => 'IDE', :size => 80.GB, :driver => "amd74xx"}
]
network_adapters [
{:interface => 'Myri-2000', :rate => 2.giga,
{:interface => 'Myri-2000', :rate => 2.G,
:switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:vendor => 'Myrinet', :version => "M3F-PCIXF-2", :enabled => true},
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true, :driver => "tg3"}
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3"}
]
end
end
......@@ -74,16 +74,16 @@ site :lyon do |site_uid|
:vendor => "AMD",
:model => "AMD Opteron",
:version => "250",
:clock_speed => 2.4.giga,
:clock_speed => 2.4.G,
:instruction_set => "",
:other_description => "",
:cache_l1 => nil,
:cache_l1i => nil,
:cache_l1d => nil,
:cache_l2 => 1.MB
:cache_l2 => 1.MiB
})
main_memory({
:ram_size => 2.GB(true), # bytes
:ram_size => 2.GiB, # bytes
:virtual_size => nil
})
operating_system({
......@@ -92,10 +92,10 @@ site :lyon do |site_uid|
:version => nil
})
storage_devices [
{:interface => 'SCSI', :size => 73.GB(false), :driver => "mptspi"}
{:interface => 'SCSI', :size => 73.GB, :driver => "mptspi"}
]
network_adapters [
{:interface => 'Ethernet', :rate => 1.giga, :enabled => true,
{:interface => 'Ethernet', :rate => 1.G, :enabled => true,
:switch => "little-ego", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
:driver => "tg3"}
]
......
......@@ -28,16 +28,16 @@ site :nancy do |site_uid|
:vendor => "Intel",
:model => "Intel Xeon",
:version => "5110",
:clock_speed => 1.6.giga,
:clock_speed => 1.6.G,