Update network configuration for Amsterdam

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index de44f7f2caf2436ee13aa4d54c5a81ae414bbc89..233436979a327a0c2204ce3a98f77a69878bf3e7 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -18,13 +18,13 @@ default_attributes(
         :family => :inet6,
         :address => "2001:470:1:41:a800:ff:fe3e:cdca",
         :prefix => "64",
-        :gateway => "fe80::21b:21ff:fead:e886"
+        :gateway => "fe80::260:ddff:fe46:623d"
       }
     }
   },
   :squid => {
-    :cache_mem => "700 MB",
-    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "400 MB",
+    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"
   },
   :sysctl => {
     :kvm => {
@@ -35,21 +35,11 @@ default_attributes(
       }
     }
   },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/xvda/queue/nr_requests" => "128",
-        "block/xvda/queue/scheduler" => "deadline"
-      }
-    }
-  },
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
       "stormfly-02.openstreetmap.org",
+      "ascalon.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
@@ -59,5 +49,6 @@ default_attributes(
 
 run_list(
   "role[prgmr]",
+  "role[geodns]",
   "role[tilecache]"
 )