X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e947590c6a42789d8a1c240331d85ca637274ed4..5a4919337b3d34a106cbc4b1ce6bf5c84a1dae44:/roles/ladon.rb

diff --git a/roles/ladon.rb b/roles/ladon.rb
index 9db255576..014319f2b 100644
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -2,9 +2,6 @@ name "ladon"
 description "Master role applied to ladon"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "36g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -18,7 +15,7 @@ default_attributes(
           :mode => "802.3ad",
           :miimon => "100",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eth0 eth1]
+          :slaves => %w[ens1f0 ens1f1]
         }
       },
       :external_ipv6 => {
@@ -30,23 +27,9 @@ default_attributes(
         :gateway => "2001:648:2ffe:4::1"
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "32768 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "athens.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[grnet]",
-  "role[tilecache]"
+  "role[grnet]"
 )