X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b1e2379f26584ff54bf236128d99a245b37226eb..6922bbdb6fbb5c8af223c1117d6d7e0b2d41f0ad:/roles/ironbelly.rb?ds=sidebyside diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 821912a19..4eb5fbc45 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -3,7 +3,24 @@ description "Master role applied to ironbelly" default_attributes( :apt => { - :sources => [ "ubuntugis-unstable" ] + :sources => ["ubuntugis-unstable"] + }, + :elasticsearch => { + :cluster => { + :routing => { + :allocation => { + :disk => { + :watermark => { + :low => "95%", + :high => "98%" + } + } + } + } + }, + :path => { + :data => "/store/elasticsearch" + } }, :git => { :allowed_nodes => "*:*", @@ -42,9 +59,27 @@ default_attributes( :peer => { :host => "ridley.openstreetmap.org" } + }, + :aws2ic => { + :port => "1195", + :mode => "server", + :peer => { + :host => "fafnir.openstreetmap.org" + } + }, + :ic2bm => { + :port => "1196", + :mode => "client", + :peer => { + :host => "grisu.openstreetmap.org", + :port => "1194" + } } } }, + :planet => { + :replication => "enabled" + }, :rsyncd => { :modules => { :hosts => { @@ -56,7 +91,7 @@ default_attributes( :uid => "tomh", :gid => "tomh", :transfer_logging => false, - :hosts_allow => [ + :hosts_allow => [ "212.110.172.32", # shenron "2001:41c9:1:400::32", # shenron "212.159.112.221" # grant @@ -77,6 +112,9 @@ default_attributes( "146.179.159.160/27", # ic internal "193.63.75.96/27", # ic external "2001:630:12:500::/64", # ic external + "10.0.32.0/20", # bytemark internal + "89.16.162.16/28", # bytemark external + "2001:41c9:2:d6::/64", # bytemark external "127.0.0.0/8", # localhost "::1" # localhost ], @@ -84,7 +122,7 @@ default_attributes( } } } -); +) run_list( "role[ic]", @@ -97,8 +135,10 @@ run_list( "role[stats]", "role[planet]", "role[planetdump]", + "role[logstash]", "recipe[rsyncd]", "recipe[openvpn]", "recipe[git::server]", - "recipe[planet::tilelog]" + "recipe[tilelog]", + "recipe[serverinfo]" )