From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Jan 2017 21:47:51 +0000 (+0000)
Subject: Use bytemark memcached servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fb3ae238744efe974e3a7a206641139f677a8e3c?hp=8bb3ca7d2d9d7e974ff22b6383a3110826b968e6

Use bytemark memcached servers
---

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 6d539ff5f..95cc5628f 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -29,7 +29,8 @@ default_attributes(
   :web => {
     :backends => %w(rails4 rails5),
     :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org"
+    :readonly_database_host => "katla.bm.openstreetmap.org",
+    :memcached_servers => %w(rails4.bm rails5.bm)
   }
 )
 
diff --git a/roles/ic.rb b/roles/ic.rb
index 4041d2b36..ff689583d 100644
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -32,7 +32,8 @@ default_attributes(
   :web => {
     :backends => %w(rails1 rails2 rails3),
     :fileserver => "ironbelly",
-    :readonly_database_host => "karm.ic.openstreetmap.org"
+    :readonly_database_host => "karm.ic.openstreetmap.org",
+    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )
 
diff --git a/roles/web.rb b/roles/web.rb
index dce003b3d..85124e485 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,8 +14,7 @@ default_attributes(
     :pool_idle_time => 0
   },
   :web => {
-    :status => "online",
-    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
+    :status => "online"
   }
 )