X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cefb1fe9134e29ef41a021dc824d291407c94cb6..9d1da497d442b16de5ab68a9cf74f832059734e7:/roles/ironbelly.rb?ds=sidebyside

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index e4ea23262..10b1e9599 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -26,11 +26,12 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.10",
+        :inet => {
+          :address => "10.0.48.10"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -38,30 +39,30 @@ default_attributes(
           :slaves => %w[eth0 eth1]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.10"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:A"
+        :inet => {
+          :address => "184.104.179.138"
+        },
+        :inet6 => {
+          :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]" }
       }
     }
   },
@@ -79,8 +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
-          "2001:978:2:2C::172:0/112", # amsterdam external
+          "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
@@ -98,7 +99,6 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[gateway]",
-  "role[supybot]",
   "recipe[rsyncd]",
   "recipe[dhcpd]"
 )