Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: deployment: activate redis replica between the masters
......................................................................
deployment: activate redis replica between the masters
Any master that is not the current deployment server will replicate its
data, as trebuchet is configured to speak only with the current master.
Bug: T124024
Change-Id: Ibe245b5fe0ebf927d55f4843e7dfcd71f1b44b64
---
A modules/deployment/manifests/redis.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 19 insertions(+), 5 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
new file mode 100644
index 0000000..7ce8f72
--- /dev/null
+++ b/modules/deployment/manifests/redis.pp
@@ -0,0 +1,18 @@
+# == Class deployment::redis
+# Simple wrapper to enable replication between trebuchet masters
+
+class deployment::redis {
+ $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet')
+
+ if ($::fqdn != $deployment_server) {
+ # Just a read-only slave for now
+ redis::instance { 6379:
+ settings => {
+ slave_read_only => true,
+ slaveof => "${deployment_server} 6379"
+ }
+ }
+ } else {
+ redis::instance{ 6379: }
+ }
+}
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index cb7a3cb..9077501 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -78,11 +78,7 @@
require => File['/srv/deployment'],
}
- redis::instance { 6379:
- settings => {
- daemonize => false,
- }
- }
+ include ::deployment::redis
# Used by the trebuchet salt returner
ferm::service { 'deployment-redis':
--
To view, visit https://gerrit.wikimedia.org/r/264945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe245b5fe0ebf927d55f4843e7dfcd71f1b44b64
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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
