Make karm the database master

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 16562fa1b9a06761f721156ab458c71cc2a69bdf..78de0b69f9abec0604fde5aae748ffb0bdf3a608 100644 (file)
--- 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" },
         :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",
     :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,
         :read_only => true,
         :write_only => false,
         :list => false,


@@ -30,7 +30,7 @@ default_attributes(
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [
         :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 c80f9a4cb5512520232ab2877f7f22c94f026b10..dbcfc2095e77134a60f1009fe2a95f1051d8224e 100644 (file)
--- 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 => {
         :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" }
         },
           :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 386fcca3cd9a01ef40ce354c73e8beaf35dd7672..21a497a6742454af3e20cd7c7048f2733e576473 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -58,5 +58,6 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[db-slave]"
+  "role[db-master]",
+  "role[db-backup]"

 )
 )

diff --git a/roles/katla.rb b/roles/katla.rb
index 93145eaf6c90e877c1d50aae02fc0481762933bf..8144942cfe550a11b8c793b7346482a6fa97e2ff 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -93,6 +93,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
 
 run_list(
   "role[bytemark]",

-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"

 )
 )