Added storage_additional parameter.

README.md

@@ -103,6 +103,19 @@ To configure Varnish to listen on port 80, specifically on localhost and
   }
 ```
 
+To use multiple storage backends in varnish for example a primary `4GB memory backend` and a `50GB file backend`:
+
+```puppet
+  class { '::varnish':
+    storage_type => 'malloc',
+    storage_size => '4G',
+    storage_additional => [
+      'file,/var/lib/varnish/varnish_additional.bin,50G',
+
+    ]
+  }
+```
+
 ### Parameter Reference
 
 |Parameter|Description|
@@ -122,6 +135,7 @@ To configure Varnish to listen on port 80, specifically on localhost and
 |storage_type|malloc or file|
 |storage_file|File to mmap on disk for cache storage|
 |storage_size|Size of storage file or RAM, eg 10G or 50%|
+|storage_additional|Hash of additional storage backends, passed plainly to varnishd -s after the normal configured storage backends|
 |package_ensure|Version of Varnish package to install, eg 3.0.5-1.el6|
 |runtime_params|hash of run-time parameters to be specified at startup|
 

manifests/init.pp

@@ -29,6 +29,8 @@
 #   Whether to use malloc (RAM only) or file storage for cache
 # [*storage_size*]
 #   Size of cache
+# [*storage_additional*]
+#   Hash of additional storage backends containing strings in the varnish format (passed to -s)
 # [*varnish_version*]
 #   Major Varnish version to use
 # [*vcl_reload*]
@@ -39,28 +41,29 @@
 #   Hash of key:value runtime parameters
 #
 class varnish (
-  $runtime_params  = {},
-  $addrepo         = true,
-  $admin_listen    = '127.0.0.1',
-  $admin_port      = '6082',
-  $listen          = '0.0.0.0',
-  $listen_port     = '6081',
-  $secret          = undef,
-  $secret_file     = '/etc/varnish/secret',
-  $vcl_conf        = '/etc/varnish/default.vcl',
-  $storage_type    = 'file',
-  $storage_file    = '/var/lib/varnish/varnish_storage.bin',
-  $storage_size    = '1G',
-  $min_threads     = '50',
-  $max_threads     = '1000',
-  $thread_timeout  = '120',
-  $varnish_version = '4.1',
-  $instance_name   = undef,
-  $package_ensure  = 'present',
-  $package_name    = 'varnish',
-  $service_name    = 'varnish',
-  $vcl_reload_cmd  = undef,
-  $vcl_reload_path = $::path,
+  $runtime_params     = {},
+  $addrepo            = true,
+  $admin_listen       = '127.0.0.1',
+  $admin_port         = '6082',
+  $listen             = '0.0.0.0',
+  $listen_port        = '6081',
+  $secret             = undef,
+  $secret_file        = '/etc/varnish/secret',
+  $vcl_conf           = '/etc/varnish/default.vcl',
+  $storage_type       = 'file',
+  $storage_file       = '/var/lib/varnish/varnish_storage.bin',
+  $storage_size       = '1G',
+  $storage_additional = [],
+  $min_threads        = '50',
+  $max_threads        = '1000',
+  $thread_timeout     = '120',
+  $varnish_version    = '4.1',
+  $instance_name      = undef,
+  $package_ensure     = 'present',
+  $package_name       = 'varnish',
+  $service_name       = 'varnish',
+  $vcl_reload_cmd     = undef,
+  $vcl_reload_path    = $::path,
 ) {
 
   if $package_ensure == 'present' {

templates/sysconfig.erb

@@ -50,4 +50,7 @@ DAEMON_OPTS="<% if scope['::varnish::params::service_provider'] == 'sysvinit' -%
              -p <%= k %>=<%= v %> \
 <% end -%>
              -S ${VARNISH_SECRET_FILE} \
-             -s ${VARNISH_STORAGE}"
+             -s ${VARNISH_STORAGE} \
+<% scope['::varnish::storage_additional'].each do |k| -%>
+             -s <%= k %> \
+<% end -%>"

templates/varnish.service.erb

@@ -41,7 +41,10 @@ ExecStart=/usr/sbin/varnishd <%= scope['::varnish::config::jail_opt'] %> \
   -p <%= k %>=<%= v %> \
 <% end -%>
   -S <%= scope['::varnish::secret_file'] %> \
-  -s <%= scope['::varnish::storage_type'] %>,<% if scope['::varnish::storage_type'] == 'file' -%><%= scope['::varnish::storage_file'] %>,<% end -%><%= scope['::varnish::storage_size'] %>
+  -s <%= scope['::varnish::storage_type'] %>,<% if scope['::varnish::storage_type'] == 'file' -%><%= scope['::varnish::storage_file'] %>,<% end -%><%= scope['::varnish::storage_size'] %> \
+<% scope['::varnish::storage_additional'].each do |k| -%>
+  -s <%= k %> \
+<% end -%>
 
 [Install]
 WantedBy=multi-user.target