Skip to content

Commit d024c0b

Browse files
author
Emilien Macchi
committed
Avoid resource dependency when having both Redis Server & Sentinel
When running Redis Server & Redis Sentinel on the same node, avoid a resource dupplication with package resource.
1 parent d72af9a commit d024c0b

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

manifests/install.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# This class installs the application.
44
#
55
class redis::install {
6-
package { $::redis::package_name:
7-
ensure => $::redis::package_ensure,
8-
}
6+
ensure_resource('package', $::redis::package_name, {
7+
'ensure' => $::redis::package_ensure
8+
})
99
}
1010

manifests/sentinel.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@
134134
) inherits redis::params {
135135

136136

137-
package { $::redis::params::package_name:
138-
ensure => $::redis::params::package_ensure,
139-
}
137+
ensure_resource('package', $::redis::params::package_name, {
138+
'ensure' => $::redis::params::package_ensure
139+
})
140140

141141
file {
142142
$config_file_orig:

spec/classes/redis_sentinel_spec.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
describe 'redis::sentinel', :type => :class do
2828
let (:facts) { debian_facts }
2929

30+
let :pre_condition do
31+
[
32+
'class { redis: }'
33+
]
34+
end
35+
3036
describe 'without parameters' do
3137

3238
it { should create_class('redis::sentinel') }

0 commit comments

Comments
 (0)