Merge remote-tracking branch 'github/pull/542'

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 11c28546403bbbb002b098f3d4ead556553291e7..4abe868d14c594333ae363efc9b71e547a76a348 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,7 +3,6 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :networking => {
-    :netplan => true,
     :firewall => {
       :inet => [
         {
@@ -37,19 +36,6 @@ default_attributes(
       }
     }
   },
-  :sysctl => {
-    :kvm => {
-      :comment => "Tuning for KVM guest",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    }
-  },
-  :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
   :sysfs => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
@@ -57,23 +43,9 @@ default_attributes(
         "block/vda/queue/nr_requests" => "128"
       }
     }
-  },
-  :tilecache => {
-    :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"
-    ]
   }
 )
 
 run_list(
-  "role[lyonix]",
-  "role[tilecache]"
+  "role[lyonix]"
 )