X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3cbf5b0a1152f144d8d754c0f944fb4f4ffa169e..7adf71073b42b3d62a55fc2b25bca186cec41705:/roles/equinix-ams.rb diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index 8ec3f9b38..4043e0dd7 100644 --- a/roles/equinix-ams.rb +++ b/roles/equinix-ams.rb @@ -3,14 +3,13 @@ description "Role applied to all servers at Equinix Amsterdam" default_attributes( :networking => { - :engine => "systemd-networkd", :roles => { :internal => { :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" } } } }, @@ -18,18 +17,23 @@ 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", - :routes => { - "2001:470:1:b3b::/64" => { :type => "unreachable" } - } + :gateway => "2001:470:1:fa1::1" } } } }, + :prometheus => { + :metrics => { + :host_location => { + :help => "Host location", + :labels => { :site => "amsterdam" } + } + } + }, :web => { :fileserver => "ironbelly", :readonly_database_host => "snap-01.ams.openstreetmap.org", @@ -39,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 => {