X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2a93fd986d88b0843b60ec576fd57117b29515d4..e36eac11a3df616d5caae151ce0629e52bdf13a2:/roles/orm.rb?ds=sidebyside diff --git a/roles/orm.rb b/roles/orm.rb index e6aad5a59..b5e00107c 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.4"], + :versions => ["9.6"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -66,7 +75,8 @@ default_attributes( }, :tile => { :database => { - :cluster => "9.4/main" + :cluster => "9.6/main", + :postgis => "2.3" }, :node_file => "/store/database/nodes", :styles => { @@ -87,7 +97,7 @@ override_attributes( ) run_list( - "role[ic]", + "role[equinix]", "role[tyan-s7010]", "role[tile]" )