X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/495102aad33ab69c269205369e7f1807d13c7a2f..a1b52618178ed082ce2b73766c248a91cfe1fb31:/roles/ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 0c89b199d..95bfe9e39 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -36,85 +36,43 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eth0 eth1]
-        }
-      },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.10",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:a",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :slaves => %w[enp2s0f0 enp2s0f1]
         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.138",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.138"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::a",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :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]" }
       }
     }
   },
-  :rsyncd => {
-    :modules => {
-      :logs => {
-        :comment => "Log files",
-        :path => "/store/logs",
-        :read_only => false,
-        :write_only => true,
-        :list => false,
-        :uid => "www-data",
-        :gid => "www-data",
-        :transfer_logging => false,
-        :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)
-          "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
-        ]
+  :nginx => {
+    :cache => {
+      :proxy => {
+          :enable => true,
+          :keys_zone => "proxy_cache_zone:256M",
+          :inactive => "180d",
+          :max_size => "51200M"
       }
     }
   }
@@ -124,5 +82,7 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]"
+  "recipe[dhcpd]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"
 )