X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e23acae405e4f71e9ca3f11f5e75ef33d2830c6a..11fdeeaa56975b200a46cc3ee7124e529621fba9:/roles/dulcy.rb?ds=sidebyside diff --git a/roles/dulcy.rb b/roles/dulcy.rb index 98c938615..420522c59 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -4,67 +4,50 @@ description "Master role applied to dulcy" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.48.9", + :inet => { + :address => "10.0.48.9" + }, :bond => { - :slaves => %w[ens18f0 ens18f1] + :mode => "802.3ad", + :lacprate => "fast", + :xmithashpolicy => "layer3+4", + :slaves => %w[enp1s0f0 enp1s0f1] } }, - :external_ipv4 => { - :interface => "bond0.2", + :external => { + :interface => "bond0.3", :role => :external, - :family => :inet, - :address => "130.117.76.9" - }, - :external_ipv6 => { - :interface => "bond0.2", - :role => :external, - :family => :inet6, - :address => "2001:978:2:2C::172:9" + :inet => { + :address => "184.104.179.137" + }, + :inet6 => { + :address => "2001:470:1:fa1::9" + } } } }, :postgresql => { - :versions => ["13"], + :versions => ["17"], :settings => { :defaults => { - :work_mem => "300MB", - :maintenance_work_mem => "10GB", - :random_page_cost => "1.5", - :effective_cache_size => "60GB", - :fsync => "on", + :work_mem => "240MB", :effective_io_concurrency => "500" } } }, :nominatim => { - :state => "standalone", - :enable_backup => false, - :enable_git_updates => true, - :dbadmins => %w[lonvia tomh], - :dbcluster => "13/main", - :postgis => "3", - :flatnode_file => "/ssd/nominatim/nodes.store", - :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", + :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store", + :enable_qa_tiles => true, + :api_workers => 14, + :api_pool_size => 10 } ) run_list( - "role[equinix]", + "role[equinix-ams]", "role[nominatim]" )