Bump cookstyle from 7.30.4 to 7.31.1

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 92267fb28058fc1e6ad192cdf90cd004062f1072..453b4b76a86e9d89415687d85081e41e7800e25f 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,49 +2,34 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator },
-      :pnorman => { :status => :user }
-    }
-  },
-  :exim => {
-    :aliases => {
-      :root => "yellowbkpk"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.0.5"
+        :address => "10.0.48.17",
+        :bond => {
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
       },
       :external_ipv4 => {
-        :interface => "eth1.2800",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.60.236.17"
-      }
-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-        "block/cciss\!c0d0/queue/scheduler" => "noop",
-        "block/cciss\!c0d1/queue/scheduler" => "noop",
-        "block/sda/queue/nr_requests" => "512",
-        "block/sda/queue/scheduler" => "deadline"
+        :address => "130.117.76.17"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:11"
       }
+
     }
   }
 )
 
 run_list(
-  "role[ucl-slough]",
-  "role[hp-g5]"
+  "role[equinix-ams]"
 )