Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277058
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.
Change-Id: Ia0b006d82a9f8d6f159ea121288a09d58603137d
---
M modules/role/manifests/cache/instances.pp
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/277058/1
diff --git a/modules/role/manifests/cache/instances.pp
b/modules/role/manifests/cache/instances.pp
index e50a5f0..26ab62c 100644
--- a/modules/role/manifests/cache/instances.pp
+++ b/modules/role/manifests/cache/instances.pp
@@ -41,23 +41,26 @@
'service' => 'varnish-be-rand',
'backends' => $cluster_nodes['eqiad'],
'be_opts' => $be_cache_be_opts,
- },
- 'cache_codfw' => {
+ }
+ }
+
+ if $::realm == 'production' {
+ $backend_caches['cache_codfw'] = {
'dynamic' => 'yes',
'type' => 'chash',
'dc' => 'codfw',
'service' => 'varnish-be',
'backends' => $cluster_nodes['codfw'],
'be_opts' => $be_cache_be_opts,
- },
- 'cache_codfw_random' => {
+ }
+ $backend_caches['cache_codfw_random'] = {
'dynamic' => 'yes',
'type' => 'random',
'dc' => 'codfw',
'service' => 'varnish-be-rand',
'backends' => $cluster_nodes['codfw'],
'be_opts' => $be_cache_be_opts,
- },
+ }
}
# temporary hack for cache_maps, because it's not fully deployed T109162
--
To view, visit https://gerrit.wikimedia.org/r/277058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0b006d82a9f8d6f159ea121288a09d58603137d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
