X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/237454ba853566e0562d5ec49e0d6e9226941af9..5441891826af401fac1ad8a40d6c64a3071ca7c7:/roles/equinix.rb?ds=inline diff --git a/roles/equinix.rb b/roles/equinix.rb index 8b711a296..e04f7fac5 100644 --- a/roles/equinix.rb +++ b/roles/equinix.rb @@ -3,13 +3,14 @@ description "Role applied to all servers at Equinix" default_attributes( :networking => { - :netplan => true, - :nameservers => ["66.28.0.45", "66.28.0.61", "2001:978:1:1::d", "2001:978:1:2::d"], :roles => { :internal => { :inet => { :prefix => "20", - :gateway => "10.0.48.10" + :gateway => "10.0.48.10", + :routes => { + "10.0.0.0/8" => { :via => "10.0.48.10" } + } } }, :external => { @@ -20,7 +21,12 @@ default_attributes( }, :inet6 => { :prefix => "64", - :gateway => "2001:978:2:2C::172:1" + :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" } + } } } } @@ -28,12 +34,14 @@ default_attributes( :web => { :backends => %w[rails1 rails2 rails3], :fileserver => "ironbelly", - :readonly_database_host => "karm.ams.openstreetmap.org" + :readonly_database_host => "snap-01.ams.openstreetmap.org", + :primary_cluster => true } ) override_attributes( :networking => { + :nameservers => ["66.28.0.45", "66.28.0.61"], :search => ["ams.openstreetmap.org", "openstreetmap.org"] }, :ntp => {