Enable geodns role on stormfly-04

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 218717bed46dde9fa7730d71f87d3aad80387a18..3a7d1a7c3dba0d748a2540ebacbefe94c604cd41 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -7,25 +7,23 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "140.211.167.100",
+        :inet => {
+          :address => "140.211.167.100"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a764"
+        },
         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
-      },
-      :external_ipv6 => {
-        :interface => "bond0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }
   },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["17"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -35,16 +33,10 @@ default_attributes(
     }
   },
   :nominatim => {
-    :state => "standalone",
-    :dbcluster => "14/main",
-    :postgis => "3",
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 100
-      }
-    }
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_workers => 19,
+    :api_pool_size => 7
   }
 )
 
@@ -52,5 +44,5 @@ run_list(
   "role[osuosl]",
   "role[hp-g9]",
   "role[geodns]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )