X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/43ac33e14359233612376a19c7f47903228d6639..63694bbb3acd7dc65ed20ab2ab7a1aa0c2cea4b2:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 85ba5e60d..ab0673089 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -5,17 +5,23 @@ default_attributes( :apt => { :sources => ["ubuntugis-unstable"] }, - :chef => { - :client => { - :version => "12.1.2-1" + :elasticsearch => { + :cluster => { + :routing => { + :allocation => { + :disk => { + :watermark => { + :low => "95%", + :high => "98%" + } + } + } + } + }, + :path => { + :data => "/store/elasticsearch" } }, - :git => { - :allowed_nodes => "*:*", - :user => "chefrepo", - :group => "chefrepo", - :backup => "chef-git" - }, :networking => { :interfaces => { :internal_ipv4 => { @@ -47,9 +53,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 => "disabled" + }, :rsyncd => { :modules => { :hosts => { @@ -77,11 +101,13 @@ default_attributes( :gid => "www-data", :transfer_logging => false, :hosts_allow => [ - "128.40.168.0/24", # ucl external (wates) - "128.40.45.192/27", # ucl external (wolfson) + "193.60.236.0/24", # ucl external "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 ], @@ -94,16 +120,14 @@ default_attributes( run_list( "role[ic]", "role[gateway]", - "role[chef-server]", - "role[chef-repository]", "role[web-storage]", "role[supybot]", "role[backup]", "role[stats]", "role[planet]", - "role[planetdump]", + # "role[planetdump]", + "role[logstash]", "recipe[rsyncd]", "recipe[openvpn]", - "recipe[git::server]", "recipe[tilelog]" )