Ottomata has submitted this change and it was merged.
Change subject: Move include of role::cache::varnish::kafka::statsv into
prodution realm conditional
......................................................................
Move include of role::cache::varnish::kafka::statsv into prodution realm
conditional
This keeps varnishkafka from being set up in labs and beta, where there
are no kafka clusters.
"Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
keys(): Requires hash to work with at /etc/puppet/manifests/role/cache.pp:388
on node i-0000007f.eqiad.wmflabs"
Bug: T76799
Change-Id: Ie5c6a274876b170bf4f7a65d4feeaf17f64610b7
---
M manifests/role/analytics/kafka.pp
M manifests/role/cache.pp
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index 66b4018..defa9b0 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -29,11 +29,11 @@
if ($::realm == 'labs') {
# TODO: Make hostnames configurable via labs global variables.
$cluster_config = {
- 'main' => {
+ 'main' => {
'kafka-main1.eqiad.wmflabs' => { 'id' => 1 },
'kafka-main2.eqiad.wmflabs' => { 'id' => 2 },
},
- 'external' => {
+ 'external' => {
'kafka-external1.eqiad.wmflabs' => { 'id' => 10 },
},
}
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 940b208..39a6413 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1151,7 +1151,7 @@
}
include role::cache::varnish::logging::eventlistener
- include role::cache::varnish::kafka::statsv
+
# ToDo: Remove production conditional once this works
# is verified to work in labs.
@@ -1162,6 +1162,8 @@
topic => 'webrequest_bits',
varnish_name => $::hostname,
}
+
+ include role::cache::varnish::kafka::statsv
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5c6a274876b170bf4f7a65d4feeaf17f64610b7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Greg Grossmeier <[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
