Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260415
Change subject: Use new kafka role in role::cache::kafka
......................................................................
Use new kafka role in role::cache::kafka
Bug: T121659
Change-Id: I755e1422b35e8b0b04cbd9a6c4fbd9091f6c861f
---
M modules/role/manifests/cache/kafka.pp
1 file changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/260415/1
diff --git a/modules/role/manifests/cache/kafka.pp
b/modules/role/manifests/cache/kafka.pp
index c93f8ff..bb7fb84 100644
--- a/modules/role/manifests/cache/kafka.pp
+++ b/modules/role/manifests/cache/kafka.pp
@@ -2,19 +2,8 @@
# Base class for instances of varnishkafka on cache servers.
#
class role::cache::kafka {
- require role::analytics::kafka::config
-
- # Get a list of kafka brokers for the currently configured
$kafka_cluster_name.
- # In production this will be 'eqiad' always, since we only have one Kafka
cluster there.
- # Even though $kafka_cluster_name should hardcoded to 'eqiad' in
...kafka::config,
- # we hardcode it again here, just to be sure it doesn't accidentally get
changed
- # if we add new Kafka clusters later.
- $kafka_cluster_name = $::realm ? {
- 'production' => 'eqiad',
- 'labs' => $role::analytics::kafka::config::kafka_cluster_name,
- }
-
- $kafka_brokers =
keys($role::analytics::kafka::config::cluster_config[$kafka_cluster_name])
+ require role::kafka::analytics::config
+ $kafka_brokers = $::role::kafka::analytics::config::brokers_array
# Make sure varnishkafka rsyslog file is in place properly.
rsyslog::conf { 'varnishkafka':
--
To view, visit https://gerrit.wikimedia.org/r/260415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I755e1422b35e8b0b04cbd9a6c4fbd9091f6c861f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
