Merge remote-tracking branch 'github/pull/696'

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 10b1e95993cd188446068784f9c731faca31f4ee..696ee3f560fc4dbf3a6f2e1d30651434c234e145 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -36,7 +36,7 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[eth0 eth1]
+          :slaves => %w[enp2s0f0 enp2s0f1]

         }
       },
       :external => {
         }
       },
       :external => {


@@ -66,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 => {


@@ -100,5 +110,7 @@ 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]",
+  "recipe[imagery::us_imagery]"

 )
 )