tilecache: Remove USA peers from NZ caches

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

diff --git a/roles/thorn-03.rb b/roles/thorn-03.rb
index d2f7cf602deecd939aae7b59cc0dd87210b04a49..9a2393669242a85d23a8652a14d53bf90c6232ee 100644 (file)
--- a/roles/thorn-03.rb
+++ b/roles/thorn-03.rb
@@ -5,29 +5,19 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.167"
+        :address => "10.0.48.53",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
-      }
-    }
-  },
-  :web => {
-    :readonly_database_host => "db-slave"
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-g5]",
+  "role[equinix]",
   "role[web-backend]"
 )