X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8aff36f30dc7d2df2ba40783f422b2405106e926..c954aeff2861e3c9fcd8e236f08a2b15f4a00202:/roles/ironbelly.rb?ds=inline

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 635e197fa..eb6ff6c53 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,9 +2,6 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
-  :apt => {
-    :sources => ["ubuntugis-unstable"]
-  },
   :bind => {
     :clients => "equinix-ams"
   },
@@ -38,6 +35,9 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.10",
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eth0 eth1]
         }
       },
@@ -55,19 +55,16 @@ default_attributes(
       }
     }
   },
-  :planet => {
-    :replication => "enabled"
-  },
   :prometheus => {
     :snmp => {
       "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
       "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
-      "switch1" => { :address => "130.117.76.2", :modules => %w[if_mib cisco_550x], :labels => { "site" => "amsterdam" } }
+      "switch1" => { :address => "130.117.76.2", :modules => %w[if_mib juniper_ex4300], :labels => { "site" => "amsterdam" } }
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "te[12]/0/1" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0" }
       }
     }
   },
@@ -105,10 +102,6 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "role[supybot]",
-  "role[backup]",
-  "role[planet]",
-  "role[planetdump]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]",
-  "recipe[tilelog]"
+  "recipe[dhcpd]"
 )