X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8a91485750044e1a2371ac2623247354893a84f4..0993dbc450a5678cfcea86dd71cf5873b18d86f3:/roles/grisu.rb diff --git a/roles/grisu.rb b/roles/grisu.rb index bd0cb8065..ebc62416b 100644 --- a/roles/grisu.rb +++ b/roles/grisu.rb @@ -10,7 +10,7 @@ default_attributes( :family => :inet, :address => "10.0.32.20", :bond => { - :slaves => %w(em1 em2) + :slaves => %w[em1 em2] } }, :external_ipv4 => { @@ -30,21 +30,31 @@ default_attributes( :openvpn => { :address => "10.0.16.5", :tunnels => { - :aws2bm => { + :ic2bm => { :port => "1194", :mode => "server", :peer => { :host => "ironbelly.openstreetmap.org" } }, - :ic2bm => { + :aws2bm => { :port => "1195", :mode => "server", :peer => { :host => "fafnir.openstreetmap.org" } + }, + :ucl2bm => { + :port => "1196", + :mode => "server", + :peer => { + :host => "ridley.openstreetmap.org" + } } } + }, + :planet => { + :replication => "disabled" } )