Revert "Switch web site to readonly against karm"

This reverts commit f2e063ccae80b92c17712da609d8d74ffef08ba9.

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index af38d7387b0b15a65819735cdc513edd8b75b973..7923e09d46e744837baf0221ae07bf37f14c4df6 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -36,7 +36,7 @@ default_attributes(
   },
   :web => {
     :fileserver => "ironbelly",
-    :readonly_database_host => "karm.ams.openstreetmap.org",
+    :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
   }
 )

diff --git a/roles/web-db.rb b/roles/web-db.rb
index 3db0cc4a787d0d816d4c9086de923d7cab52dfac..c03da5277b620a825a52d96a7b4213957a92401e 100644 (file)
--- a/roles/web-db.rb
+++ b/roles/web-db.rb
@@ -3,6 +3,6 @@ description "Role applied to all servers needing to find the main database"
 
 default_attributes(
   :web => {
-    :database_host => "karm.ams.openstreetmap.org"
+    :database_host => "snap-01.ams.openstreetmap.org"
   }
 )

diff --git a/roles/web.rb b/roles/web.rb
index b0d9d4b99219dac6ecec0078fb817f7a6212560f..594c18f842334523036f53e869319eca640d7c51 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -16,7 +16,7 @@ default_attributes(
     :pool_idle_time => 3600
   },
   :web => {
-    :status => "database_readonly",
+    :status => "online",
     :memcached_servers => %w[spike-06.ams spike-07.ams spike-08.ams]
   }
 )