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

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

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 20a55a9736981b43a050e0830b6b8650d32ce01b..af518eb9179163e9f271d450ac24fd567fb0a442 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -2,24 +2,73 @@ 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 => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eno1",
+        :interface => "bond0",

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

-        :address => "140.211.167.100"
+        :address => "140.211.167.100",
+        :bond => {
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eno1",
+        :interface => "bond0",

         :role => :external,
         :family => :inet6,
         :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }
         :role => :external,
         :family => :inet6,
         :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }

+  },
+  :postgresql => {
+    :versions => ["12"],
+    :settings => {
+      :defaults => {
+        :work_mem => "300MB",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB",
+        :fsync => "on",
+        :effective_io_concurrency => "100"
+      }
+    }
+  },
+  :nominatim => {
+    :state => "standalone",
+    :enable_backup => false,
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "12/main",
+    :postgis => "2.5",
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
+    :fpm_pools => {
+      "nominatim.openstreetmap.org" => {
+        :max_children => 100
+      }
+    },
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/ssd/tablespaces/daux",
+      "iaux" => "/ssd/tablespaces/iaux"
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )