nominatim: remove some dead config options

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 37b219d3f468c821087b1e0f410319669c9fa676..32fa6a823756fade2d6d79a3154655b6bced8ac3 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,14 +4,20 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[eno1 enp5s0f0]
+        }
+      },

       :internal_ipv4 => {
       :internal_ipv4 => {

-        :interface => "em1.2801",
+        :interface => "bond0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {

-        :interface => "em1.2800",
+        :interface => "bond0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"


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

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

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",


@@ -27,6 +33,7 @@ default_attributes(
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",

+        :effective_io_concurrency => "256",

         :fsync => "off"
       }
     }
         :fsync => "off"
       }
     }


@@ -34,7 +41,9 @@ default_attributes(
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],

-    :dbcluster => "9.6/main",
+    :dbcluster => "14/main",
+    :postgis => "3",
+    :enable_backup => true,

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