X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4db01305dfbca96aed42f188e4f47942bab62a5a..5fbc96e38dd8dfcb3eb1ed0a5f4319ccaf244d6d:/roles/equinix-ams.rb diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index 13ab23878..f421e3d39 100644 --- a/roles/equinix-ams.rb +++ b/roles/equinix-ams.rb @@ -3,9 +3,6 @@ description "Role applied to all servers at Equinix Amsterdam" default_attributes( :networking => { - :firewall => { - :engine => "nftables" - }, :roles => { :internal => { :inet => { @@ -20,21 +17,26 @@ default_attributes( :zone => "ams", :inet => { :prefix => "27", - :gateway => "130.117.76.1" + :gateway => "184.104.179.129" }, :inet6 => { :prefix => "64", - :gateway => "2001:978:2:2C::172:1", + :gateway => "2001:470:1:fa1::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" } + "2600:9000::/28" => { :type => "unreachable" } } } } } }, + :prometheus => { + :metrics => { + :host_location => { + :help => "Host location", + :labels => { :site => "amsterdam" } + } + } + }, :web => { :fileserver => "ironbelly", :readonly_database_host => "snap-01.ams.openstreetmap.org", @@ -44,7 +46,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 => {