Redirect forum.osm.org to forum.openstreetmap.org for https connections

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 99bc7b2b156084329a02c59d42429aa26b384ddd..ac2d388154d01150505edb282f244302c9a08539 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -41,21 +41,21 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.3"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1003"
-      # },
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:3"
+      }
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -75,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 => {
@@ -97,7 +97,7 @@ override_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[tyan-s7010]",
   "role[tile]"
 )