Push external network config in Amsterdam down to the hosts

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index b6c64a1b1a8d8a946392913a3a6aaf297a8d74ac..6d29b734c076662f7108610106d4cec4b67f1bea 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -2,36 +2,41 @@ name "odin"
 description "Master role applied to odin"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :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 => {
+      :external => {
         :interface => "bond0.2",
         :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 => "130.117.76.15",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:f",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
+        }
       }
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -51,10 +56,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "14/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
@@ -66,6 +71,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
+  "role[equinix-ams]",
   "role[tile]"
 )