From 78ec3a03182ba596b3a35bb54a91fed60fb88cbd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 7 Jan 2017 11:06:29 +0000 Subject: [PATCH] Revert "Use bytemark memcached servers" This reverts commit fb3ae238744efe974e3a7a206641139f677a8e3c. --- roles/bytemark.rb | 3 +-- roles/ic.rb | 3 +-- roles/web.rb | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 95cc5628f..6d539ff5f 100644 --- 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 ff689583d..4041d2b36 100644 --- 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 85124e485..dce003b3d 100644 --- 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) } ) -- 2.39.5