Revert "Use bytemark memcached servers"

This reverts commit fb3ae238744efe974e3a7a206641139f677a8e3c.

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 95cc5628f8f15a2338b63811618146a683aa21b2..6d539ff5f65207391a46cbcd56e69a00bfb4b177 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -29,8 +29,7 @@ default_attributes(
   :web => {
     :backends => %w(rails4 rails5),
     :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org",
-    :memcached_servers => %w(rails4.bm rails5.bm)
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 

diff --git a/roles/ic.rb b/roles/ic.rb
index ff689583d93f1bad71231107ceb883482ac18d23..4041d2b36fb9bea7b0c7c877744a92de4bc25b42 100644 (file)
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -32,8 +32,7 @@ default_attributes(
   :web => {
     :backends => %w(rails1 rails2 rails3),
     :fileserver => "ironbelly",
-    :readonly_database_host => "karm.ic.openstreetmap.org",
-    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
+    :readonly_database_host => "karm.ic.openstreetmap.org"
   }
 )
 

diff --git a/roles/web.rb b/roles/web.rb
index 85124e485f89e22b0337048d595bb6f60a294c5c..dce003b3da9acf40909b1fce6c902aad16a1f05d 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,7 +14,8 @@ default_attributes(
     :pool_idle_time => 0
   },
   :web => {
-    :status => "online"
+    :status => "online",
+    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )