Fix bonding options on faffy

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 194b139b6eba2994517433f7350f223e0d76ebbf..6143cf533a3e1565a6e25b779d8a432e22ec89c9 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,12 +2,6 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
 description "Master role applied to katla"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },

   :devices => {
     :store_slow => {
       :comment => "RAID array mounted on /store/arrays/slow",
   :devices => {
     :store_slow => {
       :comment => "RAID array mounted on /store/arrays/slow",


@@ -74,13 +68,6 @@ default_attributes(
     }
   },
   :sysctl => {
     }
   },
   :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 => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {


@@ -93,6 +80,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
 
 run_list(
   "role[bytemark]",

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

 )
 )