consolidate settings for nominatim machines

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 697baa17c3448b12929762f4b3621699cb04a898..cfa86b2b29d2108c6ec1aa4e6c063ad6e6e84dc7 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -3,7 +3,6 @@ description "Master role applied to trogdor"
 
 default_attributes(
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -25,25 +24,9 @@ default_attributes(
         "block/md1/md/sync_speed_max" => "100000"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "6400 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "amsterdam.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[blix-nl]",
-  "role[tilecache]"
+  "role[blix-nl]"
 )