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

[chef.git] / roles / equinix-ams.rb

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 7923e09d46e744837baf0221ae07bf37f14c4df6..c63522bbcdca3790cbfe5ff30d7c96d14c46ad80 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -3,25 +3,22 @@ description "Role applied to all servers at Equinix Amsterdam"
 
 default_attributes(
   :networking => {
-    :roles => {
+    :interfaces => {
       :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :metric => 200,
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.10",
+          :gateway => "10.0.48.14",
           :routes => {
-            "10.0.0.0/8" => { :via => "10.0.48.10" }
+            "10.0.0.0/8" => { :via => "10.0.48.14" }
           }
-        }
-      },
-      :external => {
-        :zone => "ams",
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.179.129"
         },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4"
         }
       }
     }
@@ -35,7 +32,6 @@ default_attributes(
     }
   },
   :web => {
-    :fileserver => "ironbelly",
     :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
   }
@@ -43,7 +39,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.48.10", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.48.14", "8.8.8.8", "8.8.4.4"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {