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

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 62225861510979311e0c9ae2f797bc2ad784c237..15cd24e9b34ec7a09a40703b946bf89aed80b1d0 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,55 +4,55 @@ 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",
+        :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 => "p5p2",
+        :interface => "bond0.2800",

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

-        :address => "128.40.168.105"
+        :address => "193.60.236.18"

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

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

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

-        :shared_buffers => "24GB",
+        :listen_addresses => "10.0.0.20",

         :work_mem => "160MB",
         :work_mem => "160MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_io_concurrency => "256",
+        :fsync => "on"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :enabled => false,
-    :database => {
-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
+    :state => "standalone",
+    :dbcluster => "14/main",
+    :postgis => "3",
+    :enable_backup => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :tablespaces => {
+      "daux" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"

     },
     },

-    :fpm_pools => {
-        :www => {
-            :port => "8000",
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :port => "8001",
-            :pm => "static",
-            :max_children => "10"
-        }
+    :config => {
+      :forward_dependencies => "yes"

     }
     }

+

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-internal]",
+  "role[ucl]",

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