Remove necrosan from tilecache peers

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index 29db5b24dbf247f3f077012ad4d4ddaeea99746f..aa4c8e94472ae29cfd0a72bd130fd31ac693e522 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -11,14 +11,21 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "openstreetmap" ]
+    :sources => ["openstreetmap"]
+  },
+  :munin => {
+    :plugins => {
+      :chrony => {
+        :systime => { :warning => "100", :critical => "250" }
+      }
+    }

   },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
       :external => { :metric => 100 }
     },
   },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
       :external => { :metric => 100 }
     },

-    :search => [ "openstreetmap.org" ]
+    :search => ["openstreetmap.org"]

   },
   :sysctl => {
     :panic => {
   },
   :sysctl => {
     :panic => {


@@ -27,24 +34,31 @@ default_attributes(
     },
     :blackhole => {
       :comment => "Do TCP level MTU probing if we seem to have an ICMP blackhole",
     },
     :blackhole => {
       :comment => "Do TCP level MTU probing if we seem to have an ICMP blackhole",

-      :parameters => { "net.ipv4.tcp_mtu_probing" => "1" }
+      :parameters => {
+        "net.ipv4.tcp_mtu_probing" => "1",
+        "net.ipv4.tcp_base_mss" => "1024"
+      }

     },
     :network_buffers => {
       :comment => "Tune network buffers",
     },
     :network_buffers => {
       :comment => "Tune network buffers",

-      :parameters => { 
+      :parameters => {

         "net.core.rmem_max" => "16777216",
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
         "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",
       }
     },
     :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",
     },
     :network_conntrack_established => {
       :comment => "Only track established connections for four hours",

-      :parameters => { 
+      :parameters => {

         "net.netfilter.nf_conntrack_tcp_timeout_established" => "14400"
       }
     },
         "net.netfilter.nf_conntrack_tcp_timeout_established" => "14400"
       }
     },


@@ -53,14 +67,11 @@ default_attributes(
       :parameters => {
         "net.ipv4.tcp_syncookies" => "1"
       }
       :parameters => {
         "net.ipv4.tcp_syncookies" => "1"
       }

-    }
-  },
-  :sysfs => {
-    :cpufreq_ondemand => {
-      :comment => "Tune the ondemand CPU frequency governor",
+    },
+    :default_qdisc => {
+      :comment => "Use pfifo_fast as the default queuing discipline",

       :parameters => {
       :parameters => {

-        "devices/system/cpu/cpufreq/ondemand/up_threshold" => "25",
-        "devices/system/cpu/cpufreq/ondemand/sampling_down_factor" => "20"
+        "net.core.default_qdisc" => "pfifo_fast"

       }
     }
   }
       }
     }
   }