Add brackets around IPv6 resolver addresses

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index c79f9c754bdd1e2fe9cd7632dd3f1962678eb647..8263b6e78cca51cce0664c810a115b0dc64b1ab3 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -14,41 +14,17 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[eno1 eno2]
-        }
-      },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :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" }
-          }
+          :slaves => %w[eno1np0 eno2np1]

         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,
         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,

-        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "184.104.179.143",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.143"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::f",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::f"

         }
       }
     }
         }
       }
     }


@@ -56,12 +32,72 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
   },
         :effective_cache_size => "16GB"
       }
     }
   },

+  :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",
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",


@@ -73,7 +109,7 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "14/main",
+      :cluster => "16/main",

       :postgis => "3"
     },
     :mapnik => "3.1",
       :postgis => "3"
     },
     :mapnik => "3.1",