X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fc644b32403b63672bd1de6b9676efec559e5961..a7e6b1e0ee32cb3e4c60cbda8183b2ca5b23dde0:/roles/orm.rb diff --git a/roles/orm.rb b/roles/orm.rb index 5e4c83135..ac2d38815 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -31,22 +31,31 @@ 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.2", :role => :external, :family => :inet, - :address => "193.63.75.98" + :address => "130.117.76.3" }, :external_ipv6 => { - :interface => "eth0", + :interface => "bond0.2", :role => :external, :family => :inet6, - :address => "2001:630:12:500:2e0:81ff:fec5:2a8c" + :address => "2001:978:2:2C::172:3" } } }, :postgresql => { - :versions => ["9.6"], + :versions => ["10"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -66,8 +75,8 @@ default_attributes( }, :tile => { :database => { - :cluster => "9.6/main", - :postgis => "2.3" + :cluster => "10/main", + :postgis => "2.4" }, :node_file => "/store/database/nodes", :styles => { @@ -88,7 +97,7 @@ override_attributes( ) run_list( - "role[ic]", + "role[equinix]", "role[tyan-s7010]", "role[tile]" )