X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ea8109d2be84cf84fdc02143367c27ac90ccfea4..85625531ef385b5be17fe2b0de369e3f1af2527b:/roles/orm.rb diff --git a/roles/orm.rb b/roles/orm.rb index 3c47c55fa..99bc7b2b1 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -31,18 +31,27 @@ default_attributes( }, :networking => { :interfaces => { + :internal_ipv4 => { + :interface => "bond0", + :role => :internal, + :family => :inet, + :address => "10.0.48.3", + :bond => { + :slaves => %w[eth0 eth1] + } + }, :external_ipv4 => { - :interface => "eth0", + :interface => "bond0.3", :role => :external, :family => :inet, - :address => "193.63.75.98" + :address => "130.117.76.3" }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2001:630:12:500:2e0:81ff:fec5:2a8c" - } + # :external_ipv6 => { + # :interface => "bond0.3", + # :role => :external, + # :family => :inet6, + # :address => "2001:978:2:2C::172:1003" + # }, } }, :postgresql => { @@ -66,12 +75,12 @@ default_attributes( }, :tile => { :database => { - :cluster => "9.6/main" + :cluster => "9.6/main", + :postgis => "2.3" }, :node_file => "/store/database/nodes", :styles => { :default => { - :revision => "v4.0.0", :tile_directories => [ { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 }, { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }