Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254412
Change subject: swift: add role::swift::swiftrepl to ms-fe1001
......................................................................
swift: add role::swift::swiftrepl to ms-fe1001
setup a swiftrepl cronjob to replicate originals from eqiad to codfw
Change-Id: I70e1e836f5449c76560c0fcc2c0730718fe4eafe
---
M manifests/role/swift.pp
M manifests/site.pp
2 files changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/254412/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 9cab26f..9657e46 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -133,3 +133,20 @@
swift::label_filesystem { $aux_partitions: }
swift::mount_filesystem { $aux_partitions: }
}
+
+class role::swift::swiftrepl {
+ include passwords::swift::eqiad_prod
+ include passwords::swift::codfw_prod
+
+ swift::swiftrepl { 'eqiad_codfw_originals':
+ source_user => 'mw:media',
+ source_api_key => $passwords::swift::eqiad_prod::rewrite_password,
+ source_auth_url => 'http://ms-fe.svc.eqiad.wmnet/auth/v1.0',
+ dest_user => 'mw:media',
+ dest_api_key => $passwords::swift::codfw_prod::rewrite_password,
+ dest_auth_url => 'http://ms-fe.svc.codfw.wmnet/auth/v1.0',
+ container_set => 'originals',
+ cron_hour => '*/6',
+ cron_minute => '12',
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 21b77a7..7689728 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1767,7 +1767,7 @@
# new server IP as a trusted proxy so X-Forwarded-For headers are trusted for
# rate limiting purposes (T66622)
node /^ms-fe1001\.eqiad\.wmnet$/ {
- role swift::proxy, swift::stats_reporter
+ role swift::proxy, swift::stats_reporter, swift::swiftrepl
include lvs::realserver
}
--
To view, visit https://gerrit.wikimedia.org/r/254412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70e1e836f5449c76560c0fcc2c0730718fe4eafe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
