X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/787431aa384f07d403f422ca64447e8bdf794e3f..10c95ba734fb2775488bfece03abc0c58badad81:/roles/nepomuk.rb diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index 4c0b7b0b9..4abe868d1 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -2,9 +2,6 @@ name "nepomuk" description "Master role applied to nepomuk" default_attributes( - :hardware => { - :shm_size => "14g" - }, :networking => { :firewall => { :inet => [ @@ -39,25 +36,6 @@ default_attributes( } } }, - :sysctl => { - :kvm => { - :comment => "Tuning for KVM guest", - :parameters => { - "kernel.sched_min_granularity_ns" => 10000000, - "kernel.sched_wakeup_granularity_ns" => 15000000 - } - } - }, - :squid => { - :version => 4, - :cache_mem => "12288 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, :sysfs => { :hdd_tune => { :comment => "Tune the queue for improved performance", @@ -65,21 +43,9 @@ default_attributes( "block/vda/queue/nr_requests" => "128" } } - }, - :tilecache => { - :tile_parent => "france.render.openstreetmap.org", - :tile_siblings => [ - # "necrosan.openstreetmap.org", # IO Overloaded - # "nepomuk.openstreetmap.org", - "noomoahk.openstreetmap.org", - "norbert.openstreetmap.org", - "ladon.openstreetmap.org", - "gorynych.openstreetmap.org" - ] } ) run_list( - "role[lyonix]", - "role[tilecache]" + "role[lyonix]" )