Set sane console log defaults

[chef.git] / roles / base.rb

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

-  :munin => {
-    :plugins => {
-      :chrony => {
-        :systime => { :warning => "100", :critical => "250" }
-      }
-    }
-  },

   :networking => {
     :roles => {
   :networking => {
     :roles => {

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

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


@@ -74,10 +67,9 @@ default_attributes(
       }
     },
     :default_qdisc => {
       }
     },
     :default_qdisc => {

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

       :parameters => {
       :parameters => {

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

       }
     },
     :tune_cpu_scheduler => {
       }
     },
     :tune_cpu_scheduler => {


@@ -85,6 +77,12 @@ default_attributes(
       :parameters => {
         "kernel.sched_autogroup_enabled" => 0
       }
       :parameters => {
         "kernel.sched_autogroup_enabled" => 0
       }

+    },
+    :default_console_log_level => {
+      :comment => "Set console log level defaults",
+      :parameters => {
+        "kernel.printk" => "4 4 1 7"
+      }

     }
   }
 )
     }
   }
 )


@@ -96,7 +94,6 @@ run_list(
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[prometheus]",
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[prometheus]",

-  "recipe[munin::plugins]",

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