X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/613a27fc8fba8b220436b587fa6247364abe40cc..cd73b20fa452e04b3f8a145cccf066a2b93cc6d3:/roles/meraxes.rb

diff --git a/roles/meraxes.rb b/roles/meraxes.rb
index 824f5ea82..612344407 100644
--- a/roles/meraxes.rb
+++ b/roles/meraxes.rb
@@ -2,9 +2,6 @@ name "meraxes"
 description "Master role applied to meraxes"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "36g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -19,28 +16,14 @@ default_attributes(
         :interface => "enp1s0f0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:bc8:2d57::aa1e:84ff:fe72:e660",
+        :address => "2001:bc8:2d57:100:aa1e:84ff:fe72:e660",
         :prefix => "48",
         :gateway => "2001:bc8:2::2:258: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 => "france.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[scaleway]",
-  "role[tilecache]"
+  "role[scaleway]"
 )