X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/65ed53632b05e7e5768d845acc27cfad12f06f0e..f17e3ae797bc5031f9f0fc4aecf69651516b282f:/roles/meraxes.rb?ds=inline diff --git a/roles/meraxes.rb b/roles/meraxes.rb index bd34c692f..612344407 100644 --- a/roles/meraxes.rb +++ b/roles/meraxes.rb @@ -2,9 +2,6 @@ name "meraxes" description "Master role applied to meraxes" default_attributes( - :hardware => { - :shm_size => "36g" - }, :networking => { :interfaces => { :external_ipv4 => { @@ -24,23 +21,9 @@ default_attributes( :gateway => "2001:bc8:2::2:258:1" } } - }, - :squid => { - :version => 4, - :cache_mem => "32768 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :tilecache => { - :tile_parent => "france.render.openstreetmap.org" } ) run_list( - "role[scaleway]", - "role[tilecache]" + "role[scaleway]" )