From 9b800b0b75b7d4c0a26ddfbe89f66f3bc7a6bd37 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Mar 2017 11:12:12 +0000
Subject: [PATCH] Make karm the database master

---
 roles/db-master.rb | 6 +++---
 roles/db-slave.rb  | 4 ++--
 roles/karm.rb      | 3 ++-
 roles/katla.rb     | 3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 16562fa1b..78de0b69f 100644
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -13,7 +13,7 @@ default_attributes(
         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "146.179.159.168/32" },
           { :database => "replication", :user => "replication", :address => "146.179.159.170/32" },
-          { :database => "replication", :user => "replication", :address => "10.0.16.4/32" }
+          { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
         ]
       }
     }
@@ -22,7 +22,7 @@ default_attributes(
     :modules => {
       :archive => {
         :comment => "WAL Archive",
-        :path => "/store/arrays/slow/postgresql-archive",
+        :path => "/store/arrays/nvme/postgresql-archive",
         :read_only => true,
         :write_only => false,
         :list => false,
@@ -30,7 +30,7 @@ default_attributes(
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [
-          "146.179.159.168", "146.179.159.170, 10.0.16.4"
+          "146.179.159.168", "146.179.159.170, 10.0.32.40"
         ]
       }
     }
diff --git a/roles/db-slave.rb b/roles/db-slave.rb
index c80f9a4cb..dbcfc2095 100644
--- a/roles/db-slave.rb
+++ b/roles/db-slave.rb
@@ -10,12 +10,12 @@ default_attributes(
         :hot_standby_feedback => "on",
         :standby_mode => "on",
         :primary_conninfo => {
-          :host => "katla.bm.openstreetmap.org",
+          :host => "karm.ic.openstreetmap.org",
           :port => "5432",
           :user => "replication",
           :passwords => { :bag => "db", :item => "passwords" }
         },
-        :restore_command => "/usr/bin/rsync katla.bm.openstreetmap.org::archive/%f %p"
+        :restore_command => "/usr/bin/rsync karm.ic.openstreetmap.org::archive/%f %p"
       }
     }
   }
diff --git a/roles/karm.rb b/roles/karm.rb
index 386fcca3c..21a497a67 100644
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -58,5 +58,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[db-slave]"
+  "role[db-master]",
+  "role[db-backup]"
 )
diff --git a/roles/katla.rb b/roles/katla.rb
index 93145eaf6..8144942cf 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -93,6 +93,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"
 )
-- 
2.43.2