Merge pull request echocat#100 from echocat/develop

close echocat#96 fix ensure_packages

Author: dwerder

CHANGELOG.md

@@ -5,12 +5,14 @@
 - Fix broken systemd part for Debian
 - Fix cluster coverage error in redis.conf template
 - Add required update-rc.d headers to debian init.d scripts
+- Fix ensure_packages expects an array
 
 #### Features:
 
-- redis and sentinel: allow turning off protected mode
-- Added  option to redis.conf: client-output-buffer-limit, as a hash
-- Added  option to redis.conf: repl_backlog_size, a simple value
+- Redis, Sentinel: allow turning off protected mode
+- Server: Added option to redis.conf: client-output-buffer-limit, as a hash
+- Server: Added  option to redis.conf: repl_backlog_size, a simple value
+- Server: add include parameter for config
 - allows for compatibility with Amazon Linux
 - Add cluster params documentation + enable cluster support
 

manifests/install.pp

@@ -64,15 +64,15 @@
     # install necessary packages for build.
     case $::operatingsystem {
       'Debian', 'Ubuntu' : {
-        ensure_packages('build-essential')
+        ensure_packages(['build-essential'])
         Package['build-essential'] -> Anchor['redis::prepare_build']
       }
       'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific', 'Sles' : {
-        ensure_packages('make')
+        ensure_packages(['make'])
         Package['make'] -> Anchor['redis::prepare_build']
-        ensure_packages('gcc')
+        ensure_packages(['gcc'])
         Package['gcc'] -> Anchor['redis::prepare_build']
-        ensure_packages('glibc-devel')
+        ensure_packages(['glibc-devel'])
         Package['glibc-devel'] -> Anchor['redis::prepare_build']
       }
       default            : {

manifests/server.pp

@@ -115,6 +115,9 @@
 # [*cluster_require_full_coverage*]
 #   By default Redis Cluster nodes stop accepting queries if they detect there
 #   is at least an hash slot uncovered.
+#
+# [*include*]
+#   Array of extra configs to include Example: [ '/etc/redis/local.conf' ]
 
 define redis::server (
   $redis_name                    = $name,
@@ -164,6 +167,7 @@
   $cluster_migration_barrier     = undef,
   $cluster_require_full_coverage = true,
   $protected_mode                = undef,
+  $include                       = [],
 ) {
   $redis_user              = $::redis::install::redis_user
   $redis_group             = $::redis::install::redis_group

templates/etc/redis.conf.erb

@@ -672,3 +672,6 @@ client-output-buffer-limit <%= key -%> <%= value %>
 #
 # include /path/to/local.conf
 # include /path/to/other.conf
+<% @include.each do |config| %>
+include <%= config %>
+<% end %>