Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: deployment::redis: use ipv4 address when replicating
......................................................................
deployment::redis: use ipv4 address when replicating
Change-Id: I4a4fd721a32d8a4259702c35ab345548b41ec50d
---
M modules/deployment/manifests/redis.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/redis.pp
b/modules/deployment/manifests/redis.pp
index 7ce8f72..c82faca 100644
--- a/modules/deployment/manifests/redis.pp
+++ b/modules/deployment/manifests/redis.pp
@@ -5,14 +5,18 @@
$deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet')
if ($::fqdn != $deployment_server) {
+ $deployment_ipv4 = ipresolve($deployment_server, 4)
# Just a read-only slave for now
redis::instance { 6379:
settings => {
+ daemonize => false,
slave_read_only => true,
- slaveof => "${deployment_server} 6379"
+ slaveof => "${deployment_ipv4} 6379"
}
}
} else {
- redis::instance{ 6379: }
+ redis::instance{ 6379:
+ daemonize => false,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a4fd721a32d8a4259702c35ab345548b41ec50d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
