Bump kitchen-dokken from 2.17.3 to 2.17.4

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 648b7acd4397d04447970e7f8f5c7408211ee24d..8261d7afda3d531468abf8812e54b32852259571 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -9,6 +9,16 @@ default_attributes(
     :first_address => "10.0.79.1",
     :last_address => "10.0.79.254"
   },
+  :exim => {
+    :smarthost_name => "fafnir.openstreetmap.org",
+    :routes => {
+      :openstreetmap => {
+        :comment => "openstreetmap.org",
+        :domains => ["openstreetmap.org"],
+        :host => ["shenron.openstreetmap.org"]
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -39,9 +49,9 @@ default_attributes(
   },
   :prometheus => {
     :snmp => {
-      "pdu1" => { :address => "10.0.64.100", :module => "apcups", :labels => { "site" => "dublin" } },
-      "pdu2" => { :address => "10.0.64.101", :module => "apcups", :labels => { "site" => "dublin" } },
-      "switch1" => { :address => "184.104.226.97", :module => "if_mib", :labels => { "site" => "dublin" } }
+      "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 => {
@@ -56,6 +66,6 @@ run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",
-  "role[web-storage]",
+  "role[mail]",
   "recipe[dhcpd]"
 )