Add new addresses for nepomuk

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index f0bf039cf219666825bac4edf670365ef01c0df6..6f006744eabc5cda7496365bde61557e27b7861d 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -4,7 +4,7 @@ description "Master role applied to nepomuk"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external_ipv4_old => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,
@@ -12,13 +12,38 @@ default_attributes(
         :prefix => "27",
         :gateway => "77.95.70.161"
       },
-      :external_ipv6 => {
+      :external_ipv6_old => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
         :address => "2a03:9180:1:21::a6",
         :prefix => "64",
         :gateway => "2a03:9180:1:21::a1"
+      },
+      :external_ipv4 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet,
+        :address => "77.95.65.39",
+        :prefix => "27",
+        :gateway => "77.95.65.33"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a03:9180:0:100::7",
+        :prefix => "64",
+        :gateway => "2a03:9180:0:100::1"
+      }
+    }
+  },
+  :sysctl => {
+    :kvm => {
+      :comment => "Tuning for KVM guest",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
       }
     }
   },
@@ -30,13 +55,20 @@ default_attributes(
     :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 => {
-    :tile_parent => "lyon.render.openstreetmap.org"
+    :tile_parent => "lyon.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]
   }
 )