BBlack has submitted this change and it was merged.
Change subject: varnish: Fix puppet in deployment-prep
......................................................................
varnish: Fix puppet in deployment-prep
There are no deployment-prep instances in codfw, so we currently get undefined
going in here which breaks everything. labtest is hosted in codfw but it's not
integrated with labs and has no working network.
Bug: T129270
Change-Id: Ia0b006d82a9f8d6f159ea121288a09d58603137d
---
M modules/role/manifests/cache/instances.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/instances.pp
b/modules/role/manifests/cache/instances.pp
index 89ec386..548e83b 100644
--- a/modules/role/manifests/cache/instances.pp
+++ b/modules/role/manifests/cache/instances.pp
@@ -66,8 +66,12 @@
},
}
- # temporary hack for cache_maps, because it's not fully deployed T109162
- if $title == 'maps' {
+ # the maps conditional here is a temporary hack for
+ # cache_maps, because it's not fully deployed (T109162).
+ # the production conditional is sad (vs using hiera), but I
+ # don't know of a better way to factor this out at the moment,
+ # and it may all change later...
+ if $title == 'maps' or $::realm != 'production' {
$becaches_filtered = hash_deselect_re('^cache_codfw', $backend_caches)
} else {
$becaches_filtered = $backend_caches
--
To view, visit https://gerrit.wikimedia.org/r/277058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0b006d82a9f8d6f159ea121288a09d58603137d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
