X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ef9f372aad8dfa2b4d22b619a97f72e8d9300a77..02d3998d3020f4e5c105d036ebf291ffcba10e22:/roles/dulcy.rb diff --git a/roles/dulcy.rb b/roles/dulcy.rb index 694c84f93..e69ea39dd 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -4,76 +4,56 @@ 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[p18p1 p18p2] + :mode => "802.3ad", + :lacprate => "fast", + :xmithashpolicy => "layer3+4", + :slaves => %w[ens18f0 ens18f1] } }, - :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 => ["10"], + :versions => ["15"], :settings => { :defaults => { - :work_mem => "300MB", - :maintenance_work_mem => "10GB", - :random_page_cost => "1.5", - :effective_cache_size => "60GB", - :fsync => "on", - :effective_io_concurrency => "3" + :work_mem => "240MB", + :effective_io_concurrency => "500" } } }, :nominatim => { :state => "standalone", - :enable_backup => false, - :enable_git_updates => true, - :dbadmins => %w[lonvia tomh], - :dbcluster => "10/main", - :postgis => "2.4", + :dbcluster => "15/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" - } - }, - :sysfs => { - :md_tune => { - :comment => "Enable request merging for NVMe devices", - :parameters => { - "block/nvme0n1/queue/nomerges" => "1", - "block/nvme1n1/queue/nomerges" => "1" - } + :api_flavour => "python", + :api_workers => 14, + :api_pool_size => 10, + :config => { + :forward_dependencies => "yes" } } ) run_list( - "role[equinix]", + "role[equinix-ams]", "role[nominatim]" )