X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae8ba54e0a9159714a0c7d9abdd5a23c3f063194..9609940accb4bc20bc380f2b35e850c0f5d0f66d:/roles/katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index d29a80382..8023e0e30 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -50,11 +50,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.173",
-        :hwaddress => "00:25:90:94:91:00"
+        :address => "10.0.32.40",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
       }
     }
   },
@@ -69,6 +71,13 @@ 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 => {
@@ -77,10 +86,10 @@ default_attributes(
       }
     }
   }
-);
+)
 
 run_list(
-  "role[ic]",
-  "role[db-slave]",
+  "role[bytemark]",
+  "role[db-master]",
   "role[db-backup]"
 )