Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index f444ded4442a54e4dc67360a13fd5f58cb82b363..29a4548be815eb42a795fc26a8fe252291eee318 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -8,35 +8,35 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
         :interface => "bond0",
         :role => :internal,
         :family => :inet,

-        :address => "10.0.48.1",
+        :address => "10.0.48.9",

         :bond => {
         :bond => {

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

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

-        :interface => "bond0.3",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "130.117.76.1"
+        :address => "130.117.76.9"

       },
       },

-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1001"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:9"
+      }

     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

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

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :work_mem => "300MB",
+        :work_mem => "240MB",

         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",

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

       }
     }
   },
       }
     }
   },


@@ -45,8 +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 => "9.6/main",
+    :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",


@@ -60,19 +64,10 @@ default_attributes(
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
     }
       "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(
   }
 )
 
 run_list(

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

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