Switch katla to use postgresql.org packages

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 674dd854efcc363d49273afa4212e05aa14a5440..93145eaf6c90e877c1d50aae02fc0481762933bf 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,6 +2,9 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :db => {
     :cluster => "9.1/main"
   },
@@ -50,11 +53,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 +74,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 => {
@@ -80,7 +92,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[bytemark]",
   "role[db-master]",
   "role[db-backup]"
 )