imagery: increase randomise delay on mapserver restart

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 8261d7afda3d531468abf8812e54b32852259571..c443332c2e493096f626108862d76ff755892d49 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,15 +2,11 @@ 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"
   },
   :exim => {
   :dhcpd => {
     :first_address => "10.0.79.1",
     :last_address => "10.0.79.254"
   },
   :exim => {

-    :smarthost_name => "fafnir.openstreetmap.org",

     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",
     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",


@@ -21,11 +17,12 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.64.2",
+        :inet => {
+          :address => "10.0.64.2"
+        },

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",


@@ -33,30 +30,30 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet,
-        :address => "184.104.226.98"
-      },
-      :external_ipv6 => {
+      :external => {

         :interface => "bond0.101",
         :role => :external,
         :interface => "bond0.101",
         :role => :external,

-        :family => :inet6,
-        :address => "2001:470:1:b3b::2"
+        :inet => {
+          :address => "184.104.226.98"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::2"
+        }

       }
     }
   },
   :prometheus => {
       }
     }
   },
   :prometheus => {

+    :junos => {
+      "switch1" => { :address => "184.104.226.97", :labels => { "site" => "dublin" } }
+    },

     :snmp => {
       "pdu1" => { :address => "10.0.64.100", :modules => %w[apcups], :labels => { "site" => "dublin" } },
     :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" } }
+      "pdu2" => { :address => "10.0.64.101", :modules => %w[apcups], :labels => { "site" => "dublin" } }

     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",

-        :labels => { :site => "dublin", :name => "ae50" }
+        :labels => { :site => "dublin", :name => "xe-[01]/2/[01]|ge-[01]/2/2" }

       }
     }
   }
       }
     }
   }