imagery: enable nginx cache correctly

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index a063d0d73e88309cc474d6bb0b0f6008b07d3c8c..4d3c83a747260f6be2195cc5648d77a6b59bb6a7 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -39,52 +39,40 @@ default_attributes(
           :slaves => %w[eth0 eth1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :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" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :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 => "184.104.179.129", :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|ae60" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
+      }
+    }
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+          :enable => true,
+          :keys_zone => "proxy_cache_zone:256M",
+          :inactive => "180d",
+          :max_size => "51200M"
       }
     }
   },
@@ -122,5 +110,6 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]"
+  "recipe[dhcpd]",
+  "recipe[imagery::za_ngi_aerial]"
 )