Merge pull request #236 from Tigerfell/master

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 4fe77de8364eb7052136b738210a7de637102d5f..46a199b94d823718f3defddfc0c3950b1eabbce4 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,22 +3,45 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

+    :firewall => {
+      :inet => [
+        {
+          :action => "ACCEPT",
+          :source => "net:77.95.64.120,77.95.64.131,77.95.64.139",
+          :dest => "fw",
+          :proto => "tcp",
+          :dest_ports => "5666",
+          :source_ports => "1024:",
+          :rate_limit => "-",
+          :connection_limit => "-"
+        }
+      ]
+    },

     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,

-        :address => "77.95.70.166",
+        :address => "77.95.65.39",

         :prefix => "27",
         :prefix => "27",

-        :gateway => "77.95.70.161"
+        :gateway => "77.95.65.33"

       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,

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

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

-        :gateway => "2001:7f8:47:21::a1"
+        :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 +53,22 @@ 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"

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

-    :tile_parent => "lyon.render.openstreetmap.org"
+    :tile_parent => "france.render.openstreetmap.org",
+    :tile_siblings => [
+      "noomoahk.openstreetmap.org",
+      "norbert.openstreetmap.org",
+      "necrosan.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]

   }
 )
 
   }
 )