Use .ruby-version for local and travis

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 3c47c55faa4d5b8e83817c07dcc58a799675ce6c..ac2d388154d01150505edb282f244302c9a08539 100644 (file)
--- 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,12 +75,12 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
           { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
@@ -88,7 +97,7 @@ override_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[tyan-s7010]",
   "role[tile]"
 )