Add brackets around IPv6 resolver addresses

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 89d89d0d946bb9e2b4d3a3b34b4ddb96d2aabe4a..8263b6e78cca51cce0664c810a115b0dc64b1ab3 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,49 +4,126 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :internal => {
         :interface => "bond0",
-        :role => :external,
-        :family => :inet,
-        :address => "130.225.254.123",
-        :prefix => "23",
-        :gateway => "130.225.254.97",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.15"
+        },
         :bond => {
           :mode => "802.3ad",
-          :miimon => "100",
-          :xmithashpolicy => "layer3+4",
           :lacprate => "fast",
-          :slaves => %w[eno1 eno2]
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1np0 eno2np1]
         }
       },
-      :external_ipv6 => {
-        :interface => "bond0",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:878:346::123",
-        :prefix => "64",
-        :gateway => "2001:878:346::97"
+        :inet => {
+          :address => "184.104.179.143"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f"
+        }
       }
     }
   },
-  :squid => {
-    :version => "3",
-    :cache_mem => "14000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :effective_cache_size => "16GB"
+      }
+    }
   },
-  :tilecache => {
-    :tile_parent => "aalborg.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+  :sysfs => {
+    :cpu_power_energy_perf_bias => {
+      :parameters => {
+        "devices/system/cpu/cpu0/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu1/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu2/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu3/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu4/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu5/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu6/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu7/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu8/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu9/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu10/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu11/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu12/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu13/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu14/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu15/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu16/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu17/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu18/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu19/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu20/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu21/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu22/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu23/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu24/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu25/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu26/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu27/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu28/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu29/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu30/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu31/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu32/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu33/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu34/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu35/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu36/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu37/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu38/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu39/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu40/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu41/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu42/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu43/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu44/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu45/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu46/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu47/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu48/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu49/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu50/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu51/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu52/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu53/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu54/power/energy_perf_bias" => "0",
+        "devices/system/cpu/cpu55/power/energy_perf_bias" => "0"
+      }
+    }
+  },
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }
+  },
+  :tile => {
+    :database => {
+      :cluster => "16/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[dotsrc]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[tile]"
 )