X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0ad5d49adcd3ca833168fd249e62ee75f3a9046d..11fdeeaa56975b200a46cc3ee7124e529621fba9:/roles/longma.rb diff --git a/roles/longma.rb b/roles/longma.rb index a8380824f..e4b3ebc55 100644 --- a/roles/longma.rb +++ b/roles/longma.rb @@ -4,69 +4,47 @@ description "Master role applied to longma" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.13", + :inet => { + :address => "10.0.64.13" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", :xmithashpolicy => "layer3+4", - :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3] + :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3] } }, - :external_ipv4 => { + :external => { :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "184.104.226.109" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::d" + :inet => { + :address => "184.104.226.109" + }, + :inet6 => { + :address => "2001:470:1:b3b::d" + } } } }, :postgresql => { - :versions => ["14"], + :versions => ["17"], :settings => { :defaults => { + :max_connections => "550", :work_mem => "240MB", - :maintenance_work_mem => "10GB", - :random_page_cost => "1.5", - :effective_cache_size => "60GB", - :fsync => "off", :effective_io_concurrency => "500" } } }, :nominatim => { - :state => "standalone", - :enable_backup => false, - :enable_git_updates => true, - :dbadmins => %w[lonvia tomh], - :dbcluster => "14/main", - :postgis => "3", - :flatnode_file => "/ssd/nominatim/nodes.store", - :config => { - :tokenizer => "icu" - }, - :logdir => "/ssd/nominatim/log", - :tablespaces => { - "dosm" => "/ssd/tablespaces/dosm", - "iosm" => "/ssd/tablespaces/iosm", - "dplace" => "/ssd/tablespaces/dplace", - "iplace" => "/ssd/tablespaces/iplace", - "daddress" => "/ssd/tablespaces/daddress", - "iaddress" => "/ssd/tablespaces/iaddress", - "dsearch" => "/ssd/tablespaces/dsearch", - "isearch" => "/ssd/tablespaces/isearch", - "daux" => "/ssd/tablespaces/daux", - "iaux" => "/ssd/tablespaces/iaux" - } + :dbcluster => "17/main", + :enable_qa_tiles => true, + :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store", + :api_workers => 24, + :api_pool_size => 10 } )