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

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

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 941b67d893bbad1c39641835b415782bcf557586..4b94cb28bb5ca48eedd5db44550af8a63d4170e6 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -2,25 +2,50 @@ name "stormfly-04"
 description "Master role applied to stormfly-04"
 
 default_attributes(
 description "Master role applied to stormfly-04"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "38g"
+  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eno1",
+      :external => {
+        :interface => "bond0",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "140.211.167.100"
-      },
-      :external_ipv6 => {
-        :interface => "eno1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a764"
+        :inet => {
+          :address => "140.211.167.100"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a764"
+        },
+        :bond => {
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
+      }
+    }
+  },
+  :postgresql => {
+    :versions => ["15"],
+    :settings => {
+      :defaults => {
+        :work_mem => "300MB",
+        :fsync => "on",
+        :effective_io_concurrency => "100"

       }
     }
       }
     }

+  },
+  :nominatim => {
+    :state => "standalone",
+    :dbcluster => "15/main",
+    :postgis => "3",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_flavour => "python",
+    :api_workers => 19,
+    :api_pool_size => 7

   }
 )
 
 run_list(
   "role[osuosl]",
   }
 )
 
 run_list(
   "role[osuosl]",

-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[geodns]",
+  "role[nominatim]"

 )
 )