Merge remote-tracking branch 'github/pull/451'

[chef.git] / roles / katla.rb

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

-  :db => {
-    :cluster => "9.1/main"
-  },

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


@@ -50,11 +47,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0",

         :role => :internal,
         :family => :inet,
         :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]
+        }

       }
     }
   },
       }
     }
   },


@@ -77,10 +76,9 @@ default_attributes(
       }
     }
   }
       }
     }
   }

-);
+)

 
 run_list(
 
 run_list(

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

 )
 )