Don't disable loopback connection tracking on 14.04

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

diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index 6016e17dadec94f73a8454220e1cc256e3e99581..a3b1efb2258601e39e4dd8b7fadf9773c5cfcdfa 100644 (file)
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -5,10 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.166"
+        :address => "10.0.48.52",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
@@ -24,7 +27,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-g5]",
+  "role[equinix]",
   "role[web-backend]"
 )