Skip to content

Commit a2a73a6

Browse files
author
Eoghan Glynn
committed
Automatic update
This module update commit was generated by Bade. For more info please check https://github.com/paramite/bade This commit is setting modules to following state: redis - old commit: f4ffa1b - new commit: d72af9a
1 parent fd29e1f commit a2a73a6

4 files changed

Lines changed: 25 additions & 15 deletions

File tree

Puppetfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ mod 'rabbitmq',
139139
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
140140

141141
mod 'redis',
142-
:commit => 'f4ffa1b907281472c8572c7dbcee8d2f454f3e27',
142+
:commit => 'd72af9ab3c2911b6dc18c5cc12e700630ebdcfb2',
143143
:git => 'https://github.com/arioch/puppet-redis.git'
144144

145145
mod 'rsync',

redis/manifests/sentinel.pp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,23 @@
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-
content => template($conf_template);
140-
141-
$config_file:
142-
owner => $service_user,
143-
group => $service_group,
144-
mode => $config_file_mode;
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];
145149
}
146150

147151
exec {
148-
"cp ${config_file_orig} ${config_file}":
152+
"cp -p ${config_file_orig} ${config_file}":
149153
path => '/usr/bin:/bin',
150154
subscribe => File[$config_file_orig],
151155
notify => Service[$service_name],

redis/metadata.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "arioch-redis",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"author": "Tom De Vylder",
55
"summary": "Redis module",
66
"license": "Apache License, Version 2.0",
@@ -37,6 +37,13 @@
3737
"7.5"
3838
]
3939
},
40+
{
41+
"operatingsystem": "Ubuntu",
42+
"operatingsystemrelease": [
43+
"14.04",
44+
"14.10"
45+
]
46+
},
4047
{
4148
"operatingsystem": "RedHat",
4249
"operatingsystemrelease": [
@@ -61,6 +68,8 @@
6168
}
6269
],
6370
"dependencies": [
64-
71+
{
72+
"name": "puppetlabs/apt"
73+
}
6574
]
6675
}

redis/spec/classes/redis_sentinel_spec.rb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@
3333

3434
it { should contain_file('/etc/redis/redis-sentinel.conf.puppet').with(
3535
'ensure' => 'present',
36+
'mode' => '0644',
37+
'owner' => 'redis',
3638
'content' => $expected_noparams_content
3739
)
3840
}
3941

40-
it { should contain_file('/etc/redis/redis-sentinel.conf').with(
41-
'mode' => '0644'
42-
)
43-
}
44-
4542
it { should contain_service('redis-sentinel').with(
4643
'ensure' => 'running',
4744
'enable' => 'true',

0 commit comments

Comments
 (0)