Revert "Fix bonding options on faffy"

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 623717afb7511376687a084edb9c0c76683c0c16..6a77bf6e140f7ea166d9a24ca0c39a7a42ffb856 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -9,6 +9,15 @@ default_attributes(
     :first_address => "10.0.79.1",
     :last_address => "10.0.79.254"
   },
+  :exim => {
+    :routes => {
+      :openstreetmap => {
+        :comment => "openstreetmap.org",
+        :domains => ["openstreetmap.org"],
+        :host => ["shenron.openstreetmap.org"]
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -19,6 +28,7 @@ default_attributes(
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
@@ -35,6 +45,19 @@ default_attributes(
         :address => "2001:470:1:b3b::2"
       }
     }
+  },
+  :prometheus => {
+    :snmp => {
+      "pdu1" => { :address => "10.0.64.100", :modules => %w[apcups], :labels => { "site" => "dublin" } },
+      "pdu2" => { :address => "10.0.64.101", :modules => %w[apcups], :labels => { "site" => "dublin" } },
+      "switch1" => { :address => "184.104.226.97", :modules => %w[if_mib juniper_ex4300], :labels => { "site" => "dublin" } }
+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "dublin", :name => "ae50" }
+      }
+    }
   }
 )
 
@@ -42,6 +65,6 @@ run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",
-  "role[web-storage]",
+  "role[mail]",
   "recipe[dhcpd]"
 )