Upgrade bytemark machines to chef 13

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 8023e0e305f06f5b7e2301b31344d942de9a5225..4753dd832ffb95ff8ef73071e08dc4a43549e049 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,8 +2,11 @@ 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 => {
@@ -55,7 +58,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.40",
         :bond => {
-          :slaves => %w(eth0 eth1)
+          :slaves => %w[eth0 eth1]
         }
       }
     }
@@ -90,6 +93,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"
 )