Move production web servers to passenger 5

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 5dc3e27802cff3cc0847b58d896df70d065a6bc4..38b4795ba4d765a1d28d6a7933f79f8bace13d42 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -16,9 +16,18 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
         :interface => "eth0",
         :role => :external,
         :family => :inet6,

-        :address => "2001:7f8:47:21::a6",
+        :address => "2a03:9180:1:21::a6",

         :prefix => "64",
         :prefix => "64",

-        :gateway => "2001:7f8:47:21::a1"
+        :gateway => "2a03:9180:1:21::a1"
+      }
+    }
+  },
+  :sysctl => {
+    :kvm => {
+      :comment => "Tuning for KVM guest",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000

       }
     }
   },
       }
     }
   },


@@ -30,13 +39,21 @@ default_attributes(
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {

-        "block/vda/queue/nr_requests" => "512",
-       "block/vda/queue/scheduler" => "noop"
+        "block/vda/queue/nr_requests" => "128",
+        "block/vda/queue/scheduler" => "deadline"

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

-    :tile_parent => "orm.openstreetmap.org"
+    :tile_parent => "lyon.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "fume.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]

   }
 )
 
   }
 )