Fix backup expiry script to match prefixes correctly

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 4528b41ea96e7c44f8f91d5fc032271e6c5c32d2..81210a2e02bdcae9942145d0340a8c63dadd3a18 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -19,7 +19,8 @@ default_attributes(
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",

-          :slaves => %w[eno1 eno2]
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -35,6 +36,19 @@ default_attributes(
         :address => "2001:470:1:b3b::2"
       }
     }
         :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,5 +56,5 @@ run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",

-  "role[web-storage]"
+  "recipe[dhcpd]"

 )
 )