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

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index 5ffc5dee9adf35ad3fd6129bd85e1cb759582e36..d680fddb110e442b3043d208d6b83e0cb21cebb1 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -13,6 +13,13 @@ default_attributes(
   :apt => {
     :sources => ["openstreetmap"]
   },
+  :munin => {
+    :plugins => {
+      :ntp_offset => {
+        :offset => { :warning => "100", :critical => "250" }
+      }
+    }
+  },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
@@ -38,12 +45,16 @@ default_attributes(
         "net.core.rmem_max" => "16777216",
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
-        "net.ipv4.tcp_wmem" => "4096\t65536\t16777216"
+        "net.ipv4.tcp_wmem" => "4096\t65536\t16777216",
+        "net.ipv4.udp_mem" => "3145728\t4194304\t16777216"
       }
     },
     :network_backlog => {
       :comment => "Increase maximum backlog for incoming network packets",
-      :parameters => { "net.core.netdev_max_backlog" => "2500" }
+      :parameters => {
+        "net.core.netdev_max_backlog" => "2500",
+        "net.core.netdev_budget" => "600"
+      }
     },
     :network_conntrack_established => {
       :comment => "Only track established connections for four hours",
@@ -56,6 +67,12 @@ default_attributes(
       :parameters => {
         "net.ipv4.tcp_syncookies" => "1"
       }
+    },
+    :default_qdisc => {
+      :comment => "Use pfifo_fast as the default queuing discipline",
+      :parameters => {
+        "net.core.default_qdisc" => "pfifo_fast"
+      }
     }
   },
   :sysfs => {