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

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 1d96445e77fd6bd013c7882ef813d4b0d2c266f1..7b346bf6f5f4492712e518d25f75aa31d5915bca 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,14 +4,20 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[em1 p5p1]
+        }
+      },

       :internal_ipv4 => {
       :internal_ipv4 => {

-        :interface => "em1.2801",
+        :interface => "bond0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {

-        :interface => "em1.2800",
+        :interface => "bond0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"


@@ -28,12 +34,18 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :effective_io_concurrency => "256",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :effective_io_concurrency => "256",

-        :fsync => "off"
+        :fsync => "on"

       }
     }
   },
       }
     }
   },

+  :apache => {
+    :event => {
+      :max_request_workers => 3000,
+      :threads_per_child => 70
+    }
+  },

   :nominatim => {
   :nominatim => {

-    :state => "off",
+    :state => "standalone",

     :dbadmins => %w[lonvia tomh],
     :dbcluster => "12/main",
     :postgis => "2.5",
     :dbadmins => %w[lonvia tomh],
     :dbcluster => "12/main",
     :postgis => "2.5",


@@ -50,11 +62,6 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"

-    },
-    :fpm_pools => {
-      :www => {
-        :max_children => "40"
-      }

     }
   }
 )
     }
   }
 )