Enable NVME request merging on odin

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index aa5700e32aa62bcb3c6107c8817c25d3f98880b4..9de9c9341a7af89b42f4c25c53af6d1a9eba57b9 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,48 +4,40 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :internal_ipv4 => {
         :interface => "bond0",
-        :role => :external,
+        :role => :internal,
         :family => :inet,
-        :address => "130.225.254.123",
-        :prefix => "23",
-        :gateway => "130.225.254.97",
+        :address => "10.0.48.15",
         :bond => {
-          :mode => "802.3ad",
-          :miimon => "100",
-          :xmithashpolicy => "layer3+4",
-          :lacprate => "fast",
           :slaves => %w[eno1 eno2]
         }
       },
+      :external_ipv4 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet,
+        :address => "130.117.76.15"
+      },
       :external_ipv6 => {
-        :interface => "bond0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:878:346::123",
-        :prefix => "64",
-        :gateway => "2001:878:346::97"
+        :address => "2001:978:2:2C::172:F"
       }
     }
   },
-  :squid => {
-    :cache_mem => "14000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :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 => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"
+      }
+    }
   }
 )
 
 run_list(
-  "role[dotsrc]",
-  "role[tilecache]"
+  "role[equinix]"
 )