Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/272716

Change subject: Add salt grains for main kafka brokers and use in debdeploy
......................................................................

Add salt grains for main kafka brokers and use in debdeploy

Previously only the analytics kafka brokers were wired up in debdeploy.

Change-Id: I9b7a990d4b2fd27a338c209f203323f19bae5bd2
---
A hieradata/role/common/kafka/main/broker.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/272716/1

diff --git a/hieradata/role/common/kafka/main/broker.yaml 
b/hieradata/role/common/kafka/main/broker.yaml
new file mode 100644
index 0000000..6a1b509
--- /dev/null
+++ b/hieradata/role/common/kafka/main/broker.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-kafka-main:
+    value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 612d4d8..8a3280f 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -46,8 +46,9 @@
 dns-rec = debdeploy-dnsrecursor:standard, debdeploy-dnsrecursor:canary
 dns-rec-canary = debdeploy-dnsrecursor:canary
 stat = debdeploy-stat:standard, debdeploy-stat:canary
-kafka-canary = debdeploy-kafka:canary
-kafka = debdeploy-kafka:standard, debdeploy-kafka:canary
+kafka-analytics-canary = debdeploy-kafka:canary
+kafka-analytics = debdeploy-kafka:standard, debdeploy-kafka:canary
+kafka-main = debdeploy-kafka-main:standard
 elastic-canary = debdeploy-elastic:canary
 elastic-eqiad = debdeploy-elastic-eqiad:standard
 elastic-codfw = debdeploy-elastic-codfw:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/272716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b7a990d4b2fd27a338c209f203323f19bae5bd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to