X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/509ed8dd9469f3c985a399b1146a6979ace18ecc..33276255a80e64d9e70abb265f85317e52f0eac1:/roles/jakelong.rb diff --git a/roles/jakelong.rb b/roles/jakelong.rb index b164b6c89..94200c338 100644 --- a/roles/jakelong.rb +++ b/roles/jakelong.rb @@ -8,30 +8,53 @@ default_attributes( :interface => "eth0", :role => :external, :family => :inet, - :address => "64.62.205.202", - :prefix => "26", - :gateway => "64.62.205.193" + :address => "71.19.155.177", + :prefix => "24", + :gateway => "71.19.155.1" }, :external_ipv6 => { :interface => "eth0", :role => :external, :family => :inet6, - :address => "2001:470:1:41:a800:ff:fe3e:cdca", + :address => "2605:2700:0:17:a800:ff:fe3e:cdca", :prefix => "64", - :gateway => "fe80::21b:21ff:fead:e886" + :gateway => "2605:2700:0:17::1" } } }, :squid => { - :cache_mem => "650 MB", - :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30" + :cache_mem => "1024 MB", + :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30" + }, + :sysctl => { + :kvm => { + :comment => "Tuning for KVM guest", + :parameters => { + "kernel.sched_min_granularity_ns" => 10000000, + "kernel.sched_wakeup_granularity_ns" => 15000000 + } + }, + :network_conntrack_max => { + :comment => "Increase max number of connections tracked", + :parameters => { + "net.netfilter.nf_conntrack_max" => "65536" + } + } }, :tilecache => { - :tile_parent => "sanfrancisco.render.openstreetmap.org" + :tile_parent => "sanfrancisco.render.openstreetmap.org", + :tile_siblings => [ + "stormfly-02.openstreetmap.org", + "ascalon.openstreetmap.org", + "nepomuk.openstreetmap.org", + "katie.openstreetmap.org", + "konqi.openstreetmap.org" + ] } ) run_list( "role[prgmr]", + "role[geodns]", "role[tilecache]" )