BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243038
Change subject: move zerofetcher to r::c::base
......................................................................
move zerofetcher to r::c::base
Because we'll be making the XFF-decoding logic that uses its
netmapper databases universal to all the clusters...
Bug: T89177
Bug: T109286
Change-Id: I7ad6478758582a7e2fa3ed26fd57847a202dcfed
---
M modules/role/manifests/cache/base.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
3 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/243038/1
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index ef23a1b..824ff7d 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -18,4 +18,10 @@
if $::realm == 'production' {
include role::cache::perf
}
+
+ # Not ideal factorization to put this here, but works for now
+ class { 'varnish::zero_update':
+ site => $zero_site,
+ auth_content => secret('misc/zerofetcher.auth'),
+ }
}
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index b11c1ff..664afa2 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -22,11 +22,6 @@
require geoip
require geoip::dev # for VCL compilation using libGeoIP
- class { 'varnish::zero_update':
- site => $::role::cache::base::zero_site,
- auth_content => secret('misc/zerofetcher.auth'),
- }
-
$varnish_be_directors = {
'one' => {
'backend' => {
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 7cf069a..c70a1eb 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -22,11 +22,6 @@
require geoip
require geoip::dev # for VCL compilation using libGeoIP
- class { 'varnish::zero_update':
- site => $::role::cache::base::zero_site,
- auth_content => secret('misc/zerofetcher.auth'),
- }
-
$varnish_be_directors = {
'one' => {
'backend' => {
--
To view, visit https://gerrit.wikimedia.org/r/243038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ad6478758582a7e2fa3ed26fd57847a202dcfed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
