Merge remote-tracking branch 'github/pull/426'

[chef.git] / roles / boitata.rb

diff --git a/roles/boitata.rb b/roles/boitata.rb
index 1e7b99a3400fa8bd1566d23cd3299c554ba7db52..00a976ab8edffb28bc5be3e6cddccc8aec085636 100644 (file)
--- a/roles/boitata.rb
+++ b/roles/boitata.rb
@@ -3,7 +3,7 @@ description "Master role applied to boitata"
 
 default_attributes(
   :hardware => {
-    :shm_size => "12g"
+    :shm_size => "14g"
   },
   :networking => {
     :interfaces => {
@@ -27,7 +27,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
-    :cache_mem => "10240 MB",
+    :cache_mem => "8192 MB",
     :cache_dir => [
       "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
@@ -36,13 +36,7 @@ default_attributes(
     ]
   },
   :tilecache => {
-    :tile_parent => "curitiba.render.openstreetmap.org",
-    :tile_siblings => [
-      "cherufe.openstreetmap.org",
-      "ascalon.openstreetmap.org",
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "brazil.render.openstreetmap.org"
   }
 )