Bump kitchen-dokken from 2.17.4 to 2.18.0

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 8023e0e305f06f5b7e2301b31344d942de9a5225..6143cf533a3e1565a6e25b779d8a432e22ec89c9 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,9 +2,6 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
-  :db => {
-    :cluster => "9.1/main"
-  },
   :devices => {
     :store_slow => {
       :comment => "RAID array mounted on /store/arrays/slow",
@@ -55,7 +52,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.40",
         :bond => {
-          :slaves => %w(eth0 eth1)
+          :slaves => %w[eth0 eth1]
         }
       }
     }
@@ -71,13 +68,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 => {
@@ -90,6 +80,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"
 )