Explicitly set number of osm2pgsql processes

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index c5021d468b57ee7eb27c7a875d74812f96bcc0fc..0a8ecf67c351d1e59d61d6148860dfbde648e47c 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -11,19 +11,53 @@ default_attributes(
         :address => "64.62.205.202",
         :prefix => "26",
         :gateway => "64.62.205.193"
         :address => "64.62.205.202",
         :prefix => "26",
         :gateway => "64.62.205.193"

+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:470:1:41:a800:ff:fe3e:cdca",
+        :prefix => "64",
+        :gateway => "fe80::260:ddff:fe46:623d"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "650 MB",
-    :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "600 MB",
+    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
+  },
+  :sysctl => {
+    :kvm => {
+      :comment => "Tuning for KVM guest",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
+    }
+  },
+  :sysfs => {
+    :hdd_tune => {
+      :comment => "Tune the queue for improved performance",
+      :parameters => {
+        "block/xvda/queue/scheduler" => "deadline"
+      }
+    }

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "orm.openstreetmap.org"
+    :tile_parent => "sanfrancisco.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org",
+      "stormfly-02.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"
+    ]

   }
 )
 
 run_list(
   "role[prgmr]",
   }
 )
 
 run_list(
   "role[prgmr]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )