Update uplink interfaces for Amsterdam

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index 23ce9dafb36de17276569786b23af2c56d9931d3..e4b3ebc556104af75ea66da98c0241ac7c0b1e00 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -14,7 +14,7 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
+          :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3]

         }
       },
       :external => {
         }
       },
       :external => {


@@ -30,31 +30,21 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

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

     :settings => {
       :defaults => {
         :max_connections => "550",
         :work_mem => "240MB",
     :settings => {
       :defaults => {
         :max_connections => "550",
         :work_mem => "240MB",

-        :fsync => "on",

         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {

-    :state => "standalone",
-    :dbcluster => "14/main",
-    :postgis => "3",
+    :dbcluster => "17/main",

     :enable_qa_tiles => true,
     :enable_qa_tiles => true,

-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 200
-      }
-    },
-    :config => {
-      :forward_dependencies => "yes"
-    }
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_workers => 24,
+    :api_pool_size => 10

   }
 )
 
   }
 )