X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/891d86d799c1c03889a9c6762c09560620cd15b3..be28146ca2e5f5c3a11d9cb6b57d6287b2abb1d8:/roles/ladon.rb

diff --git a/roles/ladon.rb b/roles/ladon.rb
index d64411431..014319f2b 100644
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -3,7 +3,6 @@ description "Master role applied to ladon"
 
 default_attributes(
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "bond0",
@@ -16,7 +15,7 @@ default_attributes(
           :mode => "802.3ad",
           :miimon => "100",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eth0 eth1]
+          :slaves => %w[ens1f0 ens1f1]
         }
       },
       :external_ipv6 => {
@@ -28,24 +27,9 @@ default_attributes(
         :gateway => "2001:648:2ffe:4::1"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "athens.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[grnet]",
-  "role[tilecache]"
+  "role[grnet]"
 )