Use /usr/bin/env to find ruby. Improves cross platform support

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 238e403ae90f54ffd6174a20772a5a7b236b2f25..14b1f768e0ec66e5d5f22d8c77ca536c95231b84 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,26 +4,28 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.15",
+        :inet => {
+          :address => "10.0.48.15"
+        },
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.15"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:F"
+        :inet => {
+          :address => "184.104.179.143"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f"
+        }
       }
     }
   },
@@ -47,9 +49,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
@@ -61,6 +64,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[tile]"
 )