parameterize appendonly and save_db_to_disk

Author: bwitt

REFERENCE.md

@@ -278,7 +278,7 @@ Data type: `Boolean`
 
 Enable/disable appendonly mode.
 
-Default value: `false`
+Default value: `$redis::params::appendonly`
 
 ##### <a name="-redis--auto_aof_rewrite_min_size"></a>`auto_aof_rewrite_min_size`
 
@@ -823,7 +823,7 @@ Data type: `Boolean`
 
 Set if save db to disk.
 
-Default value: `true`
+Default value: `$redis::params::save_db_to_disk`
 
 ##### <a name="-redis--save_db_to_disk_interval"></a>`save_db_to_disk_interval`
 

manifests/init.pp

@@ -359,7 +359,7 @@
   Boolean $aof_rewrite_incremental_fsync                         = true,
   String[1] $appendfilename                                      = 'appendonly.aof',
   Enum['no', 'always', 'everysec'] $appendfsync                  = 'everysec',
-  Boolean $appendonly                                            = false,
+  Boolean $appendonly                                            = $redis::params::appendonly,
   String[1] $auto_aof_rewrite_min_size                           = '64mb',
   Integer[0] $auto_aof_rewrite_percentage                        = 100,
   Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]] $bind = ['127.0.0.1'],
@@ -428,7 +428,7 @@
   Integer[1] $repl_ping_slave_period                             = 10,
   Integer[1] $repl_timeout                                       = 60,
   Optional[Variant[String, Sensitive[String[1]], Deferred]] $requirepass = undef,
-  Boolean $save_db_to_disk                                       = true,
+  Boolean $save_db_to_disk                                       = $redis::params::save_db_to_disk,
   Hash $save_db_to_disk_interval                                 = { '900' => '1', '300' => '10', '60' => '10000' },
   Boolean $service_enable                                        = true,
   Stdlib::Ensure::Service $service_ensure                        = 'running',

manifests/params.pp

@@ -16,6 +16,10 @@
       $bin_path                  = '/usr/bin'
       $daemonize                 = true
       $service_name              = 'redis-server'
+      $ulimit                    = undef
+      $package_ensure            = 'present'
+      $appendonly                = 'no'
+      $save_db_to_disk           = false
 
       $sentinel_config_file      = '/etc/redis/sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
@@ -43,6 +47,10 @@
       $config_group         = 'root'
       $config_dir_mode      = '0755'
       $log_dir_mode         = '0750'
+      $ulimit                = undef
+      $package_ensure        = 'present'
+      $appendonly            = 'no'
+      $save_db_to_disk       = false
 
       $sentinel_daemonize   = false
       $sentinel_working_dir = '/tmp'
@@ -89,6 +97,10 @@
       $service_name              = 'redis'
       $workdir                   = '/var/db/redis'
       $bin_path                  = '/usr/bin'
+      $ulimit                    = undef
+      $package_ensure            = 'present'
+      $appendonly                = 'no'
+      $save_db_to_disk           = false
 
       $sentinel_config_file      = '/usr/local/etc/redis-sentinel.conf'
       $sentinel_config_file_orig = '/usr/local/etc/redis-sentinel.conf.puppet'
@@ -115,6 +127,10 @@
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
       $bin_path                  = '/usr/bin'
+      $ulimit                    = undef
+      $package_ensure            = 'present'
+      $appendonly                = 'no'
+      $save_db_to_disk           = false
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
@@ -141,6 +157,10 @@
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
       $bin_path                  = '/usr/bin'
+      $ulimit                    = undef
+      $package_ensure            = 'present'
+      $appendonly                = 'no'
+      $save_db_to_disk           = false
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'

spec/classes/redis_spec.rb

@@ -34,6 +34,9 @@
         it { is_expected.to contain_class('redis::config') }
         it { is_expected.to contain_class('redis::service') }
 
+        it { is_expected.to contain_file(config_file_orig).with_content(%r{^appendonly no$}) }
+        it { is_expected.to contain_file(config_file_orig).with_content(%r{^save ""$}) }
+
         it { is_expected.to contain_package(package_name).with_ensure('installed') }
 
         it do

templates/redis.conf.epp

@@ -346,13 +346,14 @@ databases <%= $databases %>
 #   like in the following example:
 #
 #   save ""
-<% if $save_db_to_disk { %>
-<%- $save_db_to_disk_interval.each |$seconds, $key_change| { -%>
-save <%= "${seconds} ${key_change}\n" -%>
+<% if $save_db_to_disk { -%>
+<% $save_db_to_disk_interval.map |$seconds, $key_change| { -%>
+save <%= $seconds %> <%= $key_change %>
 <%- } -%>
-<% } else { -%>
+<%- } else { -%>
 save ""
-<% } %>
+<%- } -%>
+
 # By default Redis will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
 # This will make the user aware (in a hard way) that data is not persisting