Fix SMART monitoring of nvme devices

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 1968df0945793a2ca3280ba4a372e8e7e9a9797e..e31bc6923f408babd19303045e1a298ed3d69704 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,49 +4,31 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :internal_ipv4 => {

         :interface => "bond0",
         :interface => "bond0",

-        :role => :external,
+        :role => :internal,

         :family => :inet,
         :family => :inet,

-        :address => "130.225.254.123",
-        :prefix => "23",
-        :gateway => "130.225.254.97",
+        :address => "10.0.48.15",

         :bond => {
         :bond => {

-          :mode => "802.3ad",
-          :miimon => "100",
-          :xmithashpolicy => "layer3+4",
-          :lacprate => "fast",

           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

+      :external_ipv4 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet,
+        :address => "130.117.76.15"
+      },

       :external_ipv6 => {
       :external_ipv6 => {

-        :interface => "bond0",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:878:346::123",
-        :prefix => "64",
-        :gateway => "2001:878:346::97"
+        :address => "2001:978:2:2C::172:F"

       }
     }
       }
     }

-  },
-  :squid => {
-    :version => "3",
-    :cache_mem => "14000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"
-  },
-  :tilecache => {
-    :tile_parent => "aalborg.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[dotsrc]",
-  "role[tilecache]"
+  "role[equinix]"

 )
 )