X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/04525d734a2014790eac3a886edf537923552ca8..79b2dc9bbd0a68715e59834e3fc10d3824cbea4a:/roles/angor.rb diff --git a/roles/angor.rb b/roles/angor.rb index ff735add6..be08e517c 100644 --- a/roles/angor.rb +++ b/roles/angor.rb @@ -4,41 +4,35 @@ description "Master role applied to angor" default_attributes( :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "eno1", :role => :external, - :family => :inet, - :address => "196.10.54.165", - :prefix => "29", - :gateway => "196.10.54.161" - }, - :external_ipv6 => { - :interface => "eno1", - :role => :external, - :family => :inet6, - :address => "2001:43f8:1f4:b00:b283:feff:fed8:dd45", - :prefix => "64", - :gateway => "2001:43f8:1f4:b00::1" + :inet => { + :address => "196.10.54.165", + :prefix => "29", + :gateway => "196.10.54.161" + }, + :inet6 => { + :address => "2001:43f8:1f4:b00:b283:feff:fed8:dd45", + :prefix => "64", + :gateway => "2001:43f8:1f4:b00::1" + } } } }, - :squid => { - :cache_mem => "6100 MB", - :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80" - }, - :tilecache => { - :tile_parent => "capetown.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :accounts => { + :users => { + :htonl => { :status => :user }, + :gmoncrieff => { :status => :user }, + :zander => { :status => :user }, + :"za-imagery" => { + :status => :role, + :members => [:grant, :htonl, :gmoncrieff, :zander] + } + } } ) run_list( - "role[inxza]", - "role[tilecache]" + "role[inxza]" )