Only cleanup sysctl keys that are no longer set

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index f9cb68efc411a5cc6591f35f6bd91034df1680d0..771901def23c713d669054371a00453d296d5b22 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -69,9 +69,10 @@ default_attributes(
       }
     },
     :default_qdisc => {
-      :comment => "Use pfifo_fast as the default queuing discipline",
+      :comment => "Use fq as the default queuing discipline and bbr for congestion control",
       :parameters => {
-        "net.core.default_qdisc" => "pfifo_fast"
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
       }
     },
     :tune_cpu_scheduler => {
@@ -90,7 +91,7 @@ run_list(
   "recipe[chef]",
   "recipe[devices]",
   "recipe[hardware]",
-  "recipe[munin]",
+  "recipe[munin::plugins]",
   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",