Ottomata has submitted this change and it was merged.
Change subject: Include kafka10(13|14|20) in the analytics Kafka cluster
......................................................................
Include kafka10(13|14|20) in the analytics Kafka cluster
Change-Id: I1d0fea10a177a3bf9e60c474ca45278cdbde5024
---
M manifests/role/analytics/kafka.pp
M manifests/site.pp
2 files changed, 15 insertions(+), 28 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index 4104a8c..564d9ec 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -53,10 +53,10 @@
$cluster_config = {
'eqiad' => {
'kafka1012.eqiad.wmnet' => { 'id' => 12 }, # Row A
- # 'kafka1013.eqiad.wmnet' => { 'id' => 13 }, # Row A
- # 'kafka1014.eqiad.wmnet' => { 'id' => 14 }, # Row C
+ 'kafka1013.eqiad.wmnet' => { 'id' => 13 }, # Row A
+ 'kafka1014.eqiad.wmnet' => { 'id' => 14 }, # Row C
'kafka1018.eqiad.wmnet' => { 'id' => 18 }, # Row D
- # 'kafka1020.eqiad.wmnet' => { 'id' => 20 }, # Row D
+ 'kafka1020.eqiad.wmnet' => { 'id' => 20 }, # Row D
# analytics1021 is to be decomissioned as a kafka broker.
'analytics1021.eqiad.wmnet' => { 'id' => 21 }, # Row A
'kafka1022.eqiad.wmnet' => { 'id' => 22 }, # Row C
diff --git a/manifests/site.pp b/manifests/site.pp
index c5913dd..8fbf283 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -140,31 +140,6 @@
}
-# Above analytics* kafka nodes are being renamed kafka*
-node /kafka10(12|18|22)\.eqiad\.wmnet/ {
- # Kafka brokers are routed via IPv6 so that
- # other DCs can address without public IPv4
- # addresses.
- interface::add_ip6_mapped { 'main': }
-
- role analytics::kafka::server
- include role::analytics
- include standard
-}
-
-node /kafka10(13|14|20)\.eqiad\.wmnet/ {
- # Kafka brokers are routed via IPv6 so that
- # other DCs can address without public IPv4
- # addresses.
- interface::add_ip6_mapped { 'main': }
-
- # These will be provisioned as new brokers soon - otto.
- # role analytics::kafka::server
- include standard
-}
-
-
-
# analytics1026 is the Impala master
# (llama, impala-state-store, impala-catalog)
# analytics1026 also runs misc udp2log for sqstat
@@ -1186,6 +1161,18 @@
include role::access_new_install
}
+# Analytics Kafka Brokers
+node /kafka10(12|13|14|18|20|22)\.eqiad\.wmnet/ {
+ # Kafka brokers are routed via IPv6 so that
+ # other DCs can address without public IPv4
+ # addresses.
+ interface::add_ip6_mapped { 'main': }
+
+ role analytics::kafka::server
+ include role::analytics
+ include standard
+}
+
# virtual machine for misc. PHP apps
node 'krypton.eqiad.wmnet' {
include standard
--
To view, visit https://gerrit.wikimedia.org/r/233399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d0fea10a177a3bf9e60c474ca45278cdbde5024
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
