Bump cookstyle from 7.25.6 to 7.25.8

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 35c811f3533109f4a61f5fced107590cdfaf3ef2..a205b05692cc34ca68b3fbda6f3e6eb09b9689b0 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {

-          :slaves => %w[p18p1 p18p2]
+          :slaves => %w[ens18f0 ens18f1]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -28,7 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["10"],
+    :versions => ["14"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",


@@ -36,7 +36,7 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",

-        :effective_io_concurrency => "3"
+        :effective_io_concurrency => "500"

       }
     }
   },
       }
     }
   },


@@ -45,9 +45,12 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],

-    :dbcluster => "10/main",
-    :postgis => "2.4",
+    :dbcluster => "14/main",
+    :postgis => "3",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :flatnode_file => "/ssd/nominatim/nodes.store",

+    :config => {
+      :tokenizer => "icu"
+    },

     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",


@@ -65,6 +68,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )