X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3c8f0b1687fec4ec84893d3f78f08843df0832f3..85625531ef385b5be17fe2b0de369e3f1af2527b:/roles/orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index a44ffd143..99bc7b2b1 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,7 +3,7 @@ description "Master role applied to orm"
 
 default_attributes(
   :apt => {
-    :sources => ["ubuntugis-stable"]
+    :sources => ["postgresql"]
   },
   :devices => {
     :ssd_samsung => {
@@ -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.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 => {
-    :versions => ["9.1"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -65,6 +74,10 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.6/main",
+      :postgis => "2.3"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {