Merge pull request #581 from kajinamit/fix-580

Sentinel: Use consistent owner/group for config file

Author: kenyon

REFERENCE.md

@@ -1554,6 +1554,8 @@ The following parameters are available in the `redis::sentinel` class:
 * [`config_file`](#-redis--sentinel--config_file)
 * [`config_file_orig`](#-redis--sentinel--config_file_orig)
 * [`config_file_mode`](#-redis--sentinel--config_file_mode)
+* [`config_group`](#-redis--sentinel--config_group)
+* [`config_owner`](#-redis--sentinel--config_owner)
 * [`conf_template`](#-redis--sentinel--conf_template)
 * [`daemonize`](#-redis--sentinel--daemonize)
 * [`down_after`](#-redis--sentinel--down_after)
@@ -1632,6 +1634,22 @@ Permissions of config file.
 
 Default value: `'0640'`
 
+##### <a name="-redis--sentinel--config_group"></a>`config_group`
+
+Data type: `String[1]`
+
+Adjust filesystem group for config files.
+
+Default value: `$redis::params::config_group`
+
+##### <a name="-redis--sentinel--config_owner"></a>`config_owner`
+
+Data type: `String[1]`
+
+Adjust filesystem owner for config files.
+
+Default value: `$redis::params::config_owner`
+
 ##### <a name="-redis--sentinel--conf_template"></a>`conf_template`
 
 Data type: `String[1]`

manifests/sentinel.pp

@@ -16,6 +16,12 @@
 # @param config_file_mode
 #   Permissions of config file.
 #
+# @param config_group
+#   Adjust filesystem group for config files.
+#
+# @param config_owner
+#   Adjust filesystem owner for config files.
+#
 # @param conf_template
 #   Define which template to use.
 #
@@ -164,6 +170,8 @@
   Stdlib::Absolutepath $config_file = $redis::params::sentinel_config_file,
   Stdlib::Absolutepath $config_file_orig = $redis::params::sentinel_config_file_orig,
   Stdlib::Filemode $config_file_mode = '0640',
+  String[1] $config_group = $redis::params::config_group,
+  String[1] $config_owner = $redis::params::config_owner,
   String[1] $conf_template = 'redis/redis-sentinel.conf.epp',
   Boolean $daemonize = $redis::params::sentinel_daemonize,
   Boolean $protected_mode = true,
@@ -226,8 +234,8 @@
 
   file { $config_file_orig:
     ensure  => file,
-    owner   => $service_user,
-    group   => $service_group,
+    owner   => $config_owner,
+    group   => $config_group,
     mode    => $config_file_mode,
     content => epp($conf_template),
   }