X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dd2a7911a3cc41ea5d887adcf75998532ca5ef6c..3fcbca9021c2343f8b1bbb13d99e5338a0dc7db2:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 696ee3f56..b5c07e67d 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -2,10 +2,6 @@ name "ironbelly" description "Master role applied to ironbelly" default_attributes( - :dhcpd => { - :first_address => "10.0.63.1", - :last_address => "10.0.63.254" - }, :elasticsearch => { :cluster => { :routing => { @@ -75,42 +71,12 @@ default_attributes( :max_size => "51200M" } } - }, - :rsyncd => { - :modules => { - :logs => { - :comment => "Log files", - :path => "/store/logs", - :read_only => false, - :write_only => true, - :list => false, - :uid => "www-data", - :gid => "www-data", - :transfer_logging => false, - :hosts_allow => [ - "193.60.236.0/24", # ucl external - "10.0.48.0/20", # amsterdam internal - "184.104.179.128/27", # amsterdam external - "2001:470:1:fa1::/64", # amsterdam external - "10.0.64.0/20", # dublin internal - "184.104.226.96/27", # dublin external - "2001:470:1:b3b::/64", # dublin 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 - ] - } - } } ) run_list( "role[equinix-ams]", - "role[gateway]", "recipe[rsyncd]", - "recipe[dhcpd]", "recipe[imagery::za_ngi_aerial]", "recipe[imagery::us_imagery]" )