X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dc33986459e6bdf052443bec0640e5f6b8520fce..c410bf74e84ca08033e1e8820a2e21a8de5b91c5:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 046262d43..ad5ea034b 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -5,6 +5,9 @@ default_attributes( :apt => { :sources => ["ubuntugis-unstable"] }, + :bind => { + :clients => "equinix" + }, :dhcpd => { :first_address => "10.0.63.1", :last_address => "10.0.63.254" @@ -16,7 +19,8 @@ default_attributes( :disk => { :watermark => { :low => "95%", - :high => "98%" + :high => "98%", + :flood_stage => "99%" } } } @@ -51,36 +55,16 @@ default_attributes( } } }, - :openvpn => { - :address => "10.0.16.2", - :tunnels => { - :ic2ucl => { - :port => "1194", - :mode => "server", - :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" }, + :prometheus => { + :snmp => { + "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } }, + "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } }, + "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } } + } + }, :rsyncd => { :modules => { :hosts => { @@ -130,12 +114,9 @@ run_list( "role[web-storage]", "role[supybot]", "role[backup]", - "role[stats]", "role[planet]", "role[planetdump]", - "role[logstash]", "recipe[rsyncd]", "recipe[dhcpd]", - "recipe[openvpn]", "recipe[tilelog]" )