Yuvipanda has submitted this change and it was merged.
Change subject: dynamicproxy: puppetize appendfilename setting
......................................................................
dynamicproxy: puppetize appendfilename setting
Please note this was somehow set in redis.conf on all toollabs proxies
before the transition to redis::instance and then left behind.
This will just add an explicit setting that is already in place.
Change-Id: I13cc266c4b8c1159eec6783462006cb0a57f16c2
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 7f5b41e..fe11c02 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -41,17 +41,19 @@
$resolver = join($::nameservers, ' ')
+ $redis_port = '6379'
if $redis_replication and $redis_replication[$::hostname] {
$slave_host = $redis_replication[$::hostname]
- $slaveof = "${slave_host} 6379"
+ $slaveof = "${slave_host} ${redis_port}"
}
- redis::instance { '6379':
+ redis::instance { $redis_port:
settings => {
- appendonly => 'yes',
- maxmemory => $redis_maxmemory,
- slaveof => $slaveof,
- dir => '/var/lib/redis',
+ appendonly => 'yes',
+ appendfilename => "${::hostname}-${redis_port}.aof",
+ maxmemory => $redis_maxmemory,
+ slaveof => $slaveof,
+ dir => '/var/lib/redis',
},
}
--
To view, visit https://gerrit.wikimedia.org/r/304994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13cc266c4b8c1159eec6783462006cb0a57f16c2
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
