BBlack has submitted this change and it was merged.
Change subject: Vary Zero configuration by $::realm
......................................................................
Vary Zero configuration by $::realm
The Zero configuration is only available from production boxes. Brandon
Black created publicly available URL that anyone can use although it
does not contain actual carrier data.
Theinfamous $::realm let us use Zero configuration on the beta cluster.
Change-Id: Id210524729518db64b07df2971313cb1289d7151
---
M manifests/role/cache.pp
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index adf08c7..28b99f9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1009,12 +1009,21 @@
}
}
+ # Zero mobile related configuration.
+ #
+ # /zero/ files are only reacheable from production (ie not from labs)
+ # /zero-beta/ are publicly available but do not contain actual carrier
+ # data.
+ $zero_realm = $::realm ? {
+ production => 'zero',
+ labs => 'zero-beta',
+ }
varnish::netmapper_update {
- 'zero.json': url =>
'http://noc.wikimedia.org/~bblack/zero/zero.json';
+ 'zero.json': url =>
"http://noc.wikimedia.org/~bblack/${zero_realm}/zero.json";;
}
varnish::netmapper_update {
- 'proxies.json': url =>
'http://noc.wikimedia.org/~bblack/zero/proxies.json';
+ 'proxies.json': url =>
"http://noc.wikimedia.org/~bblack/${zero_realm}/proxies.json";;
}
varnish::instance { "mobile-backend":
--
To view, visit https://gerrit.wikimedia.org/r/119769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id210524729518db64b07df2971313cb1289d7151
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
