Disable sysctl tuning on openvz systems

[chef.git] / roles / base.rb

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

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

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


@@ -23,7 +20,7 @@ default_attributes(
   :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"]
   },


@@ -69,9 +66,10 @@ default_attributes(
       }
     },
     :default_qdisc => {
       }
     },
     :default_qdisc => {

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

       :parameters => {
       :parameters => {

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

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


@@ -90,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]",