X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3df3f8f856b91864d48ad2be08a0d4bd8cdab300..9e3d6bc2332036591015cf6171a685536e26b3c1:/roles/longma.rb diff --git a/roles/longma.rb b/roles/longma.rb index ced4e927d..b8bf00af1 100644 --- a/roles/longma.rb +++ b/roles/longma.rb @@ -14,23 +14,44 @@ default_attributes( :mode => "802.3ad", :lacprate => "fast", :xmithashpolicy => "layer3+4", - :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3] + :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3] } }, - :external => { + :external_he => { :interface => "bond0.101", :role => :external, + :source_route_table => 100, + :inet => { + :address => "184.104.226.109", + :prefix => "27", + :gateway => "184.104.226.97" + }, + :inet6 => { + :address => "2001:470:1:b3b::d", + :prefix => 64, + :gateway => "2001:470:1:b3b::1" + } + }, + :external => { + :interface => "bond0.203", + :role => :external, + :metric => 150, + :source_route_table => 150, :inet => { - :address => "184.104.226.109" + :address => "87.252.214.109", + :prefix => "27", + :gateway => "87.252.214.97" }, :inet6 => { - :address => "2001:470:1:b3b::d" + :address => "2001:4d78:fe03:1c::d", + :prefix => 64, + :gateway => "2001:4d78:fe03:1c::1" } } } }, :postgresql => { - :versions => ["16"], + :versions => ["17"], :settings => { :defaults => { :max_connections => "550", @@ -40,23 +61,11 @@ default_attributes( } }, :nominatim => { - :state => "standalone", - :dbcluster => "16/main", - :postgis => "3", + :dbcluster => "17/main", :enable_qa_tiles => true, - :flatnode_file => "/ssd/nominatim/nodes.store", - :logdir => "/ssd/nominatim/log", - :api_flavour => "python", + :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store", :api_workers => 24, - :api_pool_size => 10, - :fpm_pools => { - "nominatim.openstreetmap.org" => { - :max_children => 200 - } - }, - :config => { - :forward_dependencies => "yes" - } + :api_pool_size => 10 } )