Merge interface families

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

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 98b719324530481ca03a2f949b0ad48b1650807d..ad835f89030bb7cf3a38d6dc39380e52d66b35ad 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -21,8 +21,9 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:978:2:2C::172:1",
+          :gateway => "2001:978:2:2c::172:1",
           :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" },
             "2001:978:2:2c::/64" => { :type => "unreachable" },
             "2001:4860::/32" => { :type => "unreachable" },
             "2a00:1450:4000::/37" => { :type => "unreachable" }
@@ -32,7 +33,6 @@ default_attributes(
     }
   },
   :web => {
-    :backends => %w[rails1 rails2 rails3],
     :fileserver => "ironbelly",
     :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
@@ -41,7 +41,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.48.10", "1.1.1.1", "1.0.0.1"],
+    :nameservers => ["10.0.48.10", "8.8.8.8", "8.8.4.4"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {