X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..2a3be76929b0a86a7cf206c3aef5151dfa2c2e5d:/roles/orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index e1b1e5525..ac2d38815 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,6 +2,9 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :devices => {
     :ssd_samsung => {
       :comment => "Tune scheduler for SSD",
@@ -28,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.1" ],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -62,6 +74,10 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "10/main",
+      :postgis => "2.4"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
@@ -76,12 +92,12 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ]
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[tyan-s7010]",
   "role[tile]"
 )