nominatim: remove extra listen options in nginx config

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 76a6efc62163b0f9691743cf8e29e86c14b3cc44..648b7acd4397d04447970e7f8f5c7408211ee24d 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,6 +2,13 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
 description "Master role applied to fafnir"
 
 default_attributes(

+  :bind => {
+    :clients => "equinix-dub"
+  },
+  :dhcpd => {
+    :first_address => "10.0.79.1",
+    :last_address => "10.0.79.254"
+  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -12,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 => {


@@ -28,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", :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" } }
+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "dublin", :name => "ae50" }
+      }
+    }

   }
 )
 
   }
 )
 


@@ -35,5 +56,6 @@ run_list(
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",
   "role[equinix-dub]",
   "role[hp-g9]",
   "role[gateway]",

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

 )
 )