X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a33d35c42600aa215df8467702c98bee73415f8..31f1fa863c0b208a44e10ef3ae1571024ef0f0ae:/roles/ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index aef5e90ae..78a9ac5ce 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -40,27 +40,29 @@ default_attributes(
         }
       },
       :external => {
-        :interface => "bond0.2",
+        :interface => "bond0.3",
         :role => :external,
         :inet => {
-          :address => "130.117.76.10"
+          :address => "184.104.179.138"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:a"
+          :address => "2001:470:1:fa1::a"
         }
       }
     }
   },
   :prometheus => {
+    :junos => {
+      "switch1" => { :address => "184.104.179.129", :labels => { "site" => "amsterdam" } }
+    },
     :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 juniper_ex4300], :labels => { "site" => "amsterdam" } }
+      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } }
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
       }
     }
   },
@@ -78,10 +80,8 @@ default_attributes(
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external
           "10.0.48.0/20",             # amsterdam internal
-          "130.117.76.0/27",          # amsterdam external (cogent)
-          "2001:978:2:2c::172:0/112", # amsterdam external (cogent)
-          "184.104.179.128/27",       # amsterdam external (he)
-          "2001:470:1:fa1::/64",      # amsterdam external (he)
+          "184.104.179.128/27",       # amsterdam external
+          "2001:470:1:fa1::/64",      # amsterdam external
           "10.0.64.0/20",             # dublin internal
           "184.104.226.96/27",        # dublin external
           "2001:470:1:b3b::/64",      # dublin external
@@ -100,5 +100,6 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]"
+  "recipe[dhcpd]",
+  "recipe[imagery::tiler]"
 )