Remove necrosan from tilecache peers

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index a6aa6f1d2801f4dae3d2a16e2f416e38a9a90e73..a023e8a04fb0c6d7958442cdfb0b7dcc8c94fd88 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -5,50 +5,31 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "ens3",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "85.30.190.241",
-        :prefix => "29",
-        :gateway => "85.30.190.246"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2a02:80:0:3ff8:222:64ff:fe2a:2714",
-        :prefix => "64"
+        :address => "147.228.60.16",
+        :prefix => "24",
+        :gateway => "147.228.60.1"

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

-    :cache_mem => "16000 MB",
+    :cache_mem => "4096 MB",

     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
     :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",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-        "block/cciss\!c0d0/queue/scheduler" => "noop",
-        "block/cciss\!c0d1/queue/scheduler" => "noop"
-      }
-    }
-  },

   :tilecache => {
   :tilecache => {

-    :tile_parent => "sjobo.render.openstreetmap.org",
+    :tile_parent => "pilsen.render.openstreetmap.org",

     :tile_siblings => [
     :tile_siblings => [

-      "trogdor.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
+      "sarkany.openstreetmap.org",
+      "chrysophylax.openstreetmap.org",
+      "drogon.openstreetmap.org",
+      "viserion.openstreetmap.org"

     ]
   }
 )
 
 run_list(
     ]
   }
 )
 
 run_list(

-  "role[teleservice]",
+  "role[zcu]",

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