geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index ca5956a7fe1e05cf9671b93c5064d2c328439a3c..ce481861cbee0c5a608385138070aa25d780068d 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -10,20 +10,17 @@ default_attributes(
       :jburgess => { :status => :administrator }
     }
   },
       :jburgess => { :status => :administrator }
     }
   },

-  :apt => {
-    :sources => ["openstreetmap"]
-  },

   :munin => {
     :plugins => {
   :munin => {
     :plugins => {

-      :ntp_offset => {
-        :offset => { :warning => "100", :critical => "250" }
+      :chrony => {
+        :systime => { :warning => "100", :critical => "250" }

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

-      :external => { :metric => 100 }
+      :external => { :metric => 100, :zone => "osm" }

     },
     :search => ["openstreetmap.org"]
   },
     },
     :search => ["openstreetmap.org"]
   },


@@ -46,12 +43,15 @@ default_attributes(
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
         "net.ipv4.tcp_wmem" => "4096\t65536\t16777216",
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
         "net.ipv4.tcp_wmem" => "4096\t65536\t16777216",

-        "net.ipv4.udp_mem"  => "3145728\t4194304\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",


@@ -66,18 +66,17 @@ default_attributes(
       }
     },
     :default_qdisc => {
       }
     },
     :default_qdisc => {

-      :comment => "Use pfifo_fast as the default queuing discipline",
+      :comment => "Use fq as the default queuing discipline and cubic for congestion control",

       :parameters => {
       :parameters => {

-        "net.core.default_qdisc" => "pfifo_fast"
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "cubic"

       }
       }

-    }
-  },
-  :sysfs => {
-    :cpufreq_ondemand => {
-      :comment => "Tune the ondemand CPU frequency governor",
+    },
+    :tune_cpu_scheduler => {
+      :comment => "Tune CPU scheduler for server scheduling",

       :parameters => {
       :parameters => {

-        "devices/system/cpu/cpufreq/ondemand/up_threshold" => "25",
-        "devices/system/cpu/cpufreq/ondemand/sampling_down_factor" => "100"
+        "kernel.sched_migration_cost_ns" => 50000000,
+        "kernel.sched_autogroup_enabled" => 0

       }
     }
   }
       }
     }
   }


@@ -89,7 +88,7 @@ run_list(
   "recipe[chef]",
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[chef]",
   "recipe[devices]",
   "recipe[hardware]",

-  "recipe[munin]",
+  "recipe[munin::plugins]",

   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",
   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",