Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214606
Change subject: tools: Simplify and fix tools-redis master selection
......................................................................
tools: Simplify and fix tools-redis master selection
Change-Id: I74af52a5566138f3627b76a280e64fa7609d2e41
---
M modules/toollabs/manifests/redis.pp
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/214606/1
diff --git a/modules/toollabs/manifests/redis.pp
b/modules/toollabs/manifests/redis.pp
index d66b844..834a5b2 100644
--- a/modules/toollabs/manifests/redis.pp
+++ b/modules/toollabs/manifests/redis.pp
@@ -15,14 +15,14 @@
#
class toollabs::redis (
$maxmemory = '12GB',
- $replicate_from = undef,
) inherits toollabs {
include toollabs::infrastructure
include ::redis::client::python
- if $replicate_from != $::hostname {
+ # $active_redis inherited from toollabs
+ if $active_redis != $::hostname {
$redis_replication = {
- "${::hostname}" => $replicate_from,
+ "${::hostname}" => $active_redis,
}
} else {
$redis_replication = undef
@@ -56,9 +56,7 @@
'MONITOR' => ''
},
monitor => false,
- redis_replication => {
- "${::hostname}" => $active_redis, # Defined in toollabs/init
- },
+ redis_replication => $redis_replication,
maxmemory_policy => 'allkeys-lru',
require => Labs_lvm::Volume['redis-disk'],
}
--
To view, visit https://gerrit.wikimedia.org/r/214606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74af52a5566138f3627b76a280e64fa7609d2e41
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
