Merge remote-tracking branch 'github/pull/669'

[chef.git] / roles / kessie.rb

diff --git a/roles/kessie.rb b/roles/kessie.rb
index defd93021e7a7650980c9241711e4209a2daef68..3505bc18a2edf7c999fae979dafdc3f7c23cd524 100644 (file)
--- a/roles/kessie.rb
+++ b/roles/kessie.rb
@@ -2,31 +2,25 @@ name "kessie"
 description "Master role applied to kessie"
 
 default_attributes(
-  :munin => {
-    :plugins => {
-      :sensors_temp => {
-        :temp6 => { :warning => "71.0", :critical => "76.0" },
-        :temp7 => { :warning => "71.0", :critical => "76.0" },
-        :temp8 => { :warning => "71.0", :critical => "76.0" },
-        :temp9 => { :warning => "71.0", :critical => "76.0" }
+  :sysctl => {
+    :swappiness => {
+      :comment => "Only swap in an emergency",
+      :parameters => {
+        "vm.swappiness" => "1"
       }
     }
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "em1",
+      :external => {
+        :interface => "enp2s0f0",
         :role => :external,
-        :family => :inet,
-        :address => "178.250.74.36",
-        :hwaddress => "d8:d3:85:5d:87:5e"
-      },
-      :external_ipv6 => {
-        :interface => "em1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2a02:1658:4:0:dad3:85ff:fe5d:875e",
-        :hwaddress => "d8:d3:85:5d:87:5e"
+        :inet => {
+          :address => "178.250.74.36"
+        },
+        :inet6 => {
+          :address => "2a02:1658:4:0:dad3:85ff:fe5d:875e"
+        }
       }
     }
   }