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

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

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 2ed34454d3178717e2bfe38c3f3a5dec4491a5c2..d56d0540a16e3becdacfc2fc920e842777367bbb 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -21,10 +21,7 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:470:1:fa1::1",
-          :routes => {
-            "2600:9000::/28" => { :type => "unreachable" }
-          }
+          :gateway => "2001:470:1:fa1::1"
         }
       }
     }
@@ -46,7 +43,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.48.10", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.48.10", "74.82.42.42", "2001:470:20::2"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {