Merge pull request #6 from puppetlabs-operations/pf_202

Pf 202 - adding additional logic to support cache def in the lb manifest.

Author: actown

manifests/loadbalancer.pp

@@ -1,5 +1,6 @@
 define nginx::loadbalancer(
   $workers,
+  $caches,
   $backups      = [],
   $priority     = 75,
   $template     = 'nginx/vhost-loadbalancing.conf.erb',
@@ -14,6 +15,7 @@
   $fail_timeout = 10,
   $proto        = 'http',
   $magic        = '',     # Accept arbitrary template data to append to the vhost
+  $locations    = '', 
 ) {
 
   include nginx

templates/vhost-loadbalancing.conf.erb

@@ -10,12 +10,26 @@ upstream workers {
 <% end -%>
 <% end -%>
 }
-server {
 
-<%= scope.function_template(['nginx/vhost/_listen.conf.erb']) %>
+<% unless @caches.nil? or @caches.empty? -%>
+# Hack to add in additonal upstream for caching 
+upstream vcache_workers {
+<% @caches.each do |cache| -%>
+  server <%= cache %>;
+<% end -%>
+}
+<% end -%>
 
+server {
+<%= scope.function_template(['nginx/vhost/_listen.conf.erb']) %>
+  # Define empty root dir for LB
   root /usr/share/empty;
+  <% unless @locations.nil? or @locations.empty? -%>
+  
+  # Add placeholder for additional nginx locations 
+  <%= locations %>
 
+<% end -%>
   location / {
     proxy_pass <%= @proto %>://workers;
     proxy_redirect        off;