X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/545c9ed2ad8d9ee48a8417f8b98485790fafc170..9855bf930976f2de372a7a8712b275ba52495153:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 0684875df..9ba99a7f4 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -8,7 +8,7 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.48.1",
+        :address => "10.0.48.9",
         :bond => {
           :slaves => %w[p18p1 p18p2]
         }
@@ -28,7 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["12"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -36,7 +36,7 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",
-        :effective_io_concurrency => "3"
+        :effective_io_concurrency => "500"
       }
     }
   },
@@ -45,7 +45,8 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
+    :dbcluster => "12/main",
+    :postgis => "2.5",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
@@ -60,19 +61,10 @@ default_attributes(
       "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"
-      }
-    }
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[nominatim]"
 )