Remove otrs test role from naga

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 0cb7817e06fe0536005bcc8d8d148899796fa170..4d3c83a747260f6be2195cc5648d77a6b59bb6a7 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -57,8 +57,7 @@ default_attributes(
     },
     :snmp => {
       "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :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 => {
     },
     :metrics => {
       :uplink_interface => {


@@ -67,6 +66,16 @@ default_attributes(
       }
     }
   },
       }
     }
   },

+  :nginx => {
+    :cache => {
+      :proxy => {
+          :enable => true,
+          :keys_zone => "proxy_cache_zone:256M",
+          :inactive => "180d",
+          :max_size => "51200M"
+      }
+    }
+  },

   :rsyncd => {
     :modules => {
       :logs => {
   :rsyncd => {
     :modules => {
       :logs => {


@@ -101,5 +110,6 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",

-  "recipe[dhcpd]"
+  "recipe[dhcpd]",
+  "recipe[imagery::za_ngi_aerial]"

 )
 )