Add new Amsterdam IPv6 addresses to ACLs

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

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 2621b0b7eaeb07a17861612a87dd6332bb7811be..ac8c6a8850a1241d90d0e88d737cee56082ba98c 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -14,18 +14,7 @@ default_attributes(
         }
       },
       :external => {
         }
       },
       :external => {

-        :zone => "ams",
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.179.129"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1",
-          :routes => {
-            "2600:9000::/28" => { :type => "unreachable" }
-          }
-        }
+        :zone => "ams"

       }
     }
   },
       }
     }
   },


@@ -38,7 +27,6 @@ default_attributes(
     }
   },
   :web => {
     }
   },
   :web => {

-    :fileserver => "ironbelly",

     :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
   }
     :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
   }


@@ -46,7 +34,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

-    :nameservers => ["10.0.48.14", "74.82.42.42", "2001:470:20::2"],
+    :nameservers => ["10.0.48.14", "8.8.8.8", "8.8.4.4"],

     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {