Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376388 )
Change subject: Use fq +profile::kafka::broker::kafka_cluster_name when
configuring a broker
......................................................................
Use fq +profile::kafka::broker::kafka_cluster_name when configuring a broker
kafka_cluster_name will use a global 'kafka_cluster_name' if it is in scope
without suffixing it with $::site.
Bug: 376379
Change-Id: I48290c7cefcbbe7456434d9f3b05efd1206c00e8
---
M hieradata/role/common/kafka/jumbo/broker.yaml
M modules/profile/manifests/kafka/broker.pp
M modules/role/manifests/kafka/jumbo/broker.pp
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/376388/1
diff --git a/hieradata/role/common/kafka/jumbo/broker.yaml
b/hieradata/role/common/kafka/jumbo/broker.yaml
index 0a7b97a..2960a76 100644
--- a/hieradata/role/common/kafka/jumbo/broker.yaml
+++ b/hieradata/role/common/kafka/jumbo/broker.yaml
@@ -1,6 +1,6 @@
cluster: jumbo_kafka
-kafka_cluster_name: jumbo
+profile::kafka::broker::kafka_cluster_name: jumbo
profile::kafka::broker::log_dirs: [/srv/kafka/data]
profile::kafka::broker::plaintext: true
diff --git a/modules/profile/manifests/kafka/broker.pp
b/modules/profile/manifests/kafka/broker.pp
index 6b411a7..e05badf 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -7,7 +7,7 @@
# [*kafka_cluster_name*]
# Kafka cluster name. This should be the non DC/project suffixed cluster
name,
# e.g. main, aggregate, simple, etc. The kafka_cluster_name puppet parser
-# function will determine the proper full cluster name based on $::realm
+# function will determine the proper full cluster name based on $::site
# and/or $::labsproject. Hiera: kafka_cluster_name
#
# [*statsd*]
@@ -66,7 +66,7 @@
# so that the they can fetch record batches this large.
#
class profile::kafka::broker(
- $kafka_cluster_name = hiera('kafka_cluster_name'),
+ $kafka_cluster_name =
hiera('profile::kafka::broker::kafka_cluster_name'),
$statsd = hiera('statsd'),
$plaintext =
hiera('profile::kafka::broker::plaintext'),
diff --git a/modules/role/manifests/kafka/jumbo/broker.pp
b/modules/role/manifests/kafka/jumbo/broker.pp
index 8ee04b0..c200a54 100644
--- a/modules/role/manifests/kafka/jumbo/broker.pp
+++ b/modules/role/manifests/kafka/jumbo/broker.pp
@@ -15,5 +15,5 @@
$kafka_cluster_name = 'jumbo'
$n = kafka_cluster_name($kafka_cluster_name)
notify { "kafka cluster name is given as ${kafka_cluster_name}, function
returns ${n}": }
- # include profile::kafka::broker
+ include profile::kafka::broker
}
--
To view, visit https://gerrit.wikimedia.org/r/376388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48290c7cefcbbe7456434d9f3b05efd1206c00e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
