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

[chef.git] / roles / thorn-02.rb

diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index 64891cc9ab8bcffcf47c14cba7b533d58bac04f3..493ca78d5d6e8c3630fcfc239cc4d48d58f97d41 100644 (file)
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -5,23 +5,18 @@ 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.166"
+        :address => "10.0.48.52",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }

       }
     }
       }
     }

-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[hp-g5]",
-  "role[web-backend]"
+  "role[equinix]"

 )
 )