Avoid including Chef::Mixin::ShellOut in resources

[chef.git] / roles / katla.rb

diff --git a/roles/katla.rb b/roles/katla.rb
index 8023e0e305f06f5b7e2301b31344d942de9a5225..1e471b04099e2c6737c1da56884f8a973b03e198 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,8 +2,11 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
 description "Master role applied to katla"
 
 default_attributes(

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :db => {
   :db => {

-    :cluster => "9.1/main"
+    :cluster => "9.5/main"

   },
   :devices => {
     :store_slow => {
   },
   :devices => {
     :store_slow => {


@@ -55,7 +58,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.40",
         :bond => {
         :family => :inet,
         :address => "10.0.32.40",
         :bond => {

-          :slaves => %w(eth0 eth1)
+          :slaves => %w[eth0 eth1]

         }
       }
     }
         }
       }
     }


@@ -71,13 +74,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 => {


@@ -90,6 +86,5 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
 
 run_list(
   "role[bytemark]",

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

 )
 )