X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..b173c492c728598a8ad0e7fcba23fd2a127f6e78:/roles/base.rb?ds=sidebyside diff --git a/roles/base.rb b/roles/base.rb index 879a11a3d..2a4f732a5 100644 --- a/roles/base.rb +++ b/roles/base.rb @@ -10,17 +10,10 @@ default_attributes( :jburgess => { :status => :administrator } } }, - :munin => { - :plugins => { - :chrony => { - :systime => { :warning => "100", :critical => "250" } - } - } - }, :networking => { :roles => { - :internal => { :metric => 200, :zone => "loc" }, - :external => { :metric => 100, :zone => "osm" } + :internal => { :metric => 200 }, + :external => { :metric => 100 } }, :search => ["openstreetmap.org"] }, @@ -74,10 +67,9 @@ default_attributes( } }, :default_qdisc => { - :comment => "Use fq as the default queuing discipline and cubic for congestion control", + :comment => "Use fq as the default queuing discipline", :parameters => { - "net.core.default_qdisc" => "fq", - "net.ipv4.tcp_congestion_control" => "cubic" + "net.core.default_qdisc" => "fq" } }, :tune_cpu_scheduler => { @@ -85,6 +77,12 @@ default_attributes( :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[munin::plugins]", "recipe[networking]", "recipe[exim]", "recipe[ntp]",