Move OSUOSL hosts to use interface inheritance for network configuration

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

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 2d03f873e03bbf1f175ecdadfe366181bc2f8c04..bcc11518ae69857948fb21ae7de60eb922776aa6 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -8,8 +8,6 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external => {
-        :interface => "bond0",
-        :role => :external,
         :inet => {
           :address => "140.211.167.100"
         },
@@ -23,7 +21,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["17"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -33,16 +31,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 => 80
-      }
-    }
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_workers => 19,
+    :api_pool_size => 7
   }
 )