X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4a9b4158ddba295ec94e90365399562ef60453e5..484bf308fb9f43eda4c2d7ac7b3d3d23a3288044:/roles/katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 93145eaf6..6f5376f08 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,11 +2,8 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :db => {
-    :cluster => "9.1/main"
+    :cluster => "9.5/main"
   },
   :devices => {
     :store_slow => {
@@ -58,7 +55,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.40",
         :bond => {
-          :slaves => %w(eth0 eth1)
+          :slaves => %w[eth0 eth1]
         }
       }
     }
@@ -74,13 +71,6 @@ default_attributes(
     }
   },
   :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    },
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {
@@ -93,6 +83,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"
 )