X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/36e8658c091c0acb870566433d2ab841e71b085e..5af95bd6e511c5b9f9e737b69b944fc00b60d42b:/roles/ironbelly.rb?ds=inline diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 40455ab24..4eb5fbc45 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -2,6 +2,32 @@ name "ironbelly" description "Master role applied to ironbelly" default_attributes( + :apt => { + :sources => ["ubuntugis-unstable"] + }, + :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 => { @@ -33,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 => { @@ -47,9 +91,9 @@ default_attributes( :uid => "tomh", :gid => "tomh", :transfer_logging => false, - :hosts_allow => [ - "89.16.179.150", # shenron - "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron + :hosts_allow => [ + "212.110.172.32", # shenron + "2001:41c9:1:400::32", # shenron "212.159.112.221" # grant ] }, @@ -63,23 +107,38 @@ default_attributes( :gid => "www-data", :transfer_logging => false, :hosts_allow => [ - "128.40.168.0/24", # ucl external + "128.40.168.0/24", # ucl external (wates) + "128.40.45.192/27", # ucl external (wolfson) "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 - ] + ], + :nodes_allow => "roles:tilecache" } } } -); +) 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[logstash]", "recipe[rsyncd]", - "recipe[openvpn]" + "recipe[openvpn]", + "recipe[git::server]", + "recipe[tilelog]", + "recipe[serverinfo]" )