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

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 481fc50e2bddd042c685e89b6934699376df10c8..9cd93e053b7cbedcf23da576ff7686fdb41e0b81 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -3,7 +3,7 @@ description "Master role applied to ascalon"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
@@ -28,17 +28,11 @@ default_attributes(
     ]
   },
   :tilecache => {
-    :tile_parent => "montreal.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "azure.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "montreal.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[netalerts]",
-  "role[geodns]",
   "role[tilecache]"
 )