X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/85d47e516d51e6d243af30a8d43e4b814f196db9..9a44b9d826f560fef64b54924313e8e8b589ef5a:/roles/dulcy.rb?ds=sidebyside diff --git a/roles/dulcy.rb b/roles/dulcy.rb index b12b55110..694c84f93 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -4,46 +4,49 @@ description "Master role applied to dulcy" default_attributes( :networking => { :interfaces => { + :internal_ipv4 => { + :interface => "bond0", + :role => :internal, + :family => :inet, + :address => "10.0.48.9", + :bond => { + :slaves => %w[p18p1 p18p2] + } + }, :external_ipv4 => { - :interface => "p18p1", + :interface => "bond0.2", :role => :external, :family => :inet, - :address => "193.63.75.109", - :hwaddress => "0c:c4:7a:66:96:d2" + :address => "130.117.76.9" }, :external_ipv6 => { - :interface => "p18p1", + :interface => "bond0.2", :role => :external, :family => :inet6, - :address => "2001:630:12:500:ec4:7aff:fe66:96d2" - }, - :internal_ipv4 => { - :interface => "p18p2", - :role => :internal, - :family => :inet, - :address => "146.179.159.179", - :hwaddress => "0c:c4:7a:66:96:d3" + :address => "2001:978:2:2C::172:9" } } }, :postgresql => { - :versions => ["9.6"], + :versions => ["10"], :settings => { :defaults => { :work_mem => "300MB", :maintenance_work_mem => "10GB", :random_page_cost => "1.5", :effective_cache_size => "60GB", - :fsync => "off" + :fsync => "on", + :effective_io_concurrency => "3" } } }, :nominatim => { :state => "standalone", :enable_backup => false, - :enable_git_updates => false, - :dbadmins => %w(lonvia tomh), - :dbcluster => "9.6/main", + :enable_git_updates => true, + :dbadmins => %w[lonvia tomh], + :dbcluster => "10/main", + :postgis => "2.4", :flatnode_file => "/ssd/nominatim/nodes.store", :logdir => "/ssd/nominatim/log", :tablespaces => { @@ -71,6 +74,6 @@ default_attributes( ) run_list( - "role[ic]", + "role[equinix]", "role[nominatim]" )