Update network configuration for Amsterdam

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 60b1577e9b5972b43096e6602cf6296baae1f8f8..233436979a327a0c2204ce3a98f77a69878bf3e7 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -23,9 +23,8 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :version => 3,

     :cache_mem => "400 MB",
     :cache_mem => "400 MB",

-    :cache_dir => "rock /store/squid/rock-01 7500 swap-timeout=500 max-swap-rate=100 slot-size=4096 max-size=262144"
+    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"

   },
   :sysctl => {
     :kvm => {
   },
   :sysctl => {
     :kvm => {


@@ -36,14 +35,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/xvda/queue/scheduler" => "deadline"
-      }
-    }
-  },

   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [