Relax thresholds for packet loss reporting

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 0c03f3a1b4fffb17af7019858bc5d2d4fd9630f3..0aa526bca6d4a854488d68230f15d3ff50bcf83b 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,69 +4,28 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

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

       :internal_ipv4 => {
       :internal_ipv4 => {

-        :interface => "em1",
+        :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 => "em2",
+        :interface => "bond0.2800",

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

-        :address => "128.40.45.204"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.3" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on"
+        :address => "193.60.236.18"

       }
     }
       }
     }

-  },
-  :nominatim => {
-    :enabled => true,
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :database => {
-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
-    },
-    :fpm_pools => {
-        :www => {
-            :port => "8000",
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :port => "8001",
-            :pm => "static",
-            :max_children => "10"
-        }
-    },
-    :tablespaces => {
-        "Osm2pgsql_Data" => "ssd",
-        "Osm2pgsql_Index" => "ssd",
-        "Place_Data" => "ssd",
-        "Place_Index" => "ssd",
-        "Address_Data" => "ssd",
-        "Address_Index" => "ssd",
-        "Search_Data" => "ssd",
-        "Search_Index" => "ssd",
-        "Aux_Data" => "data",
-        "Aux_Index" => "ssd"
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "role[nominatim]"
+  "role[ucl]"

 )
 )