Drop support for shorewall

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index d5230dc602c20b2a8d33726b43e21fbc077cf3ea..d37a4097da0e571e627665f1912870a92b5f432d 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -19,8 +19,8 @@ default_attributes(
   },
   :networking => {
     :roles => {
-      :internal => { :metric => 200, :zone => "loc" },
-      :external => { :metric => 100, :zone => "osm" }
+      :internal => { :metric => 200 },
+      :external => { :metric => 100 }
     },
     :search => ["openstreetmap.org"]
   },
@@ -74,16 +74,14 @@ 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 => {
       :comment => "Tune CPU scheduler for server scheduling",
       :parameters => {
-        "kernel.sched_migration_cost_ns" => 50000000,
         "kernel.sched_autogroup_enabled" => 0
       }
     }