X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b2567ba04c9d6b93e2d3b85244a13dfdc1b0e3d3..e693cad1797b863b72437a1f06850e9c98b45ba1:/roles/equinix-ams.rb diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index 98b719324..ac8c6a885 100644 --- a/roles/equinix-ams.rb +++ b/roles/equinix-ams.rb @@ -7,33 +7,26 @@ default_attributes( :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" } } } }, :external => { - :zone => "ams", - :inet => { - :prefix => "27", - :gateway => "130.117.76.1" - }, - :inet6 => { - :prefix => "64", - :gateway => "2001:978:2:2C::172:1", - :routes => { - "2001:978:2:2c::/64" => { :type => "unreachable" }, - "2001:4860::/32" => { :type => "unreachable" }, - "2a00:1450:4000::/37" => { :type => "unreachable" } - } - } + :zone => "ams" + } + } + }, + :prometheus => { + :metrics => { + :host_location => { + :help => "Host location", + :labels => { :site => "amsterdam" } } } }, :web => { - :backends => %w[rails1 rails2 rails3], - :fileserver => "ironbelly", :readonly_database_host => "snap-01.ams.openstreetmap.org", :primary_cluster => true } @@ -41,7 +34,7 @@ default_attributes( override_attributes( :networking => { - :nameservers => ["10.0.48.10", "1.1.1.1", "1.0.0.1"], + :nameservers => ["10.0.48.14", "8.8.8.8", "8.8.4.4"], :search => ["ams.openstreetmap.org", "openstreetmap.org"] }, :ntp => {