Update karma to v0.105

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index d19422decac12d23989a466cd7cb2317872e5d81..8260dfb28b7882570646ccd1d3e621e938008a05 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -60,14 +60,14 @@ default_attributes(
   },
   :prometheus => {
     :snmp => {
-      "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } },
-      "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } },
-      "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } }
+      "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" } }
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "te1/0/1" }
+        :labels => { :site => "amsterdam", :name => "te[12]/0/1" }
       }
     }
   },
@@ -99,16 +99,18 @@ default_attributes(
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external
-          "10.0.48.0/20",             # equinix internal
-          "130.117.76.0/27",          # equinix external
-          "2001:978:2:2C::172:0/112", # equinix external
+          "10.0.48.0/20",             # amsterdam internal
+          "130.117.76.0/27",          # amsterdam external
+          "2001:978:2:2C::172:0/112", # amsterdam external
+          "10.0.64.0/20",             # dublin internal
+          "184.104.226.96/27",        # dublin external
+          "2001:470:1:b3b::/64",      # dublin external
           "10.0.32.0/20",             # bytemark internal
           "89.16.162.16/28",          # bytemark external
           "2001:41c9:2:d6::/64",      # bytemark external
           "127.0.0.0/8",              # localhost
           "::1"                       # localhost
-        ],
-        :nodes_allow => "roles:tilecache"
+        ]
       }
     }
   }
@@ -117,7 +119,6 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[gateway]",
-  "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[planet]",