Update location for waima

diff --git a/roles/catalyst.rb b/roles/catalyst.rb
index cc6a7a28cfa3157278cbb6e1705b925b5da70da4..edf3fad82962699e4e3a1393376acc6abf6aa589 100644 (file)
--- a/roles/catalyst.rb
+++ b/roles/catalyst.rb
@@ -3,7 +3,7 @@ description "Role applied to all servers at Catalyst"
 
 default_attributes(
   :hosted_by => "Catalyst",
-  :location => "New Zealand",
+  :location => "Hamilton, New Zealand",
   :networking => {
     :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"],
     :roles => {

diff --git a/roles/tuatara.rb b/roles/tuatara.rb
index e371e73d301cc31843781ea6df1e02759068185e..a7c24b2315efe5966555bdb118d706360f3b892d 100644 (file)
--- a/roles/tuatara.rb
+++ b/roles/tuatara.rb
@@ -21,6 +21,7 @@ default_attributes(
   :tilecache => {
     :tile_parent => "wellington.render.openstreetmap.org",
     :tile_siblings => [
+      "waima.openstreetmap.org",
       "longma.openstreetmap.org",
       "storfly-02.openstreetmap.org",
       "jakelong.openstreetmap.org"

diff --git a/roles/waima.rb b/roles/waima.rb
index 954dedd41b94f417840b42a05789fb057f9a7b8d..32321cc90744b36031353648ac47c7027e3e45e7 100644 (file)
--- a/roles/waima.rb
+++ b/roles/waima.rb
@@ -20,7 +20,7 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "wellington.render.openstreetmap.org",
+    :tile_parent => "hamilton.render.openstreetmap.org",
     :tile_siblings => [
       "tuatara.openstreetmap.org",
       "longma.openstreetmap.org",