Skip to content

Commit d72af9a

Browse files
committed
Make config file owner dependency on redis package explicit
Without this it's possible that on a clean machine where only sentinel is being installed the install will fail because the 'redis' user (who owns the *.puppet config file) will not yet exist. By ensuring that the redis package is installed explicitly first the user will be there. The previous pull request related to this problem added the package dependency but did not make the ordering explicity.
1 parent 0e5bd1e commit d72af9a

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

manifests/sentinel.pp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,19 @@
133133
$working_dir = $::redis::params::sentinel_working_dir,
134134
) inherits redis::params {
135135

136+
137+
package { $::redis::params::package_name:
138+
ensure => $::redis::params::package_ensure,
139+
}
140+
136141
file {
137142
$config_file_orig:
138143
ensure => present,
139-
owner => $service_user,
140-
group => $service_group,
141-
mode => $config_file_mode,
142-
content => template($conf_template);
144+
owner => $service_user,
145+
group => $service_group,
146+
mode => $config_file_mode,
147+
content => template($conf_template),
148+
require => Package[$::redis::params::package_name];
143149
}
144150

145151
exec {
@@ -150,10 +156,6 @@
150156
refreshonly => true;
151157
}
152158

153-
package { $::redis::params::package_name:
154-
ensure => $::redis::params::package_ensure,
155-
}
156-
157159
service { $service_name:
158160
ensure => $::redis::params::service_ensure,
159161
enable => $::redis::params::service_enable,

0 commit comments

Comments
 (0)